Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check for MyFaces

Browse Source 
Issue: SWF-1650, SWF-1656
This commit is contained in:
Rossen Stoyanchev
2015-06-04 16:21:41 -04:00
parent b51b30ed01
commit 7c4d2e25ad
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2012 the original author or authors. * Copyright 2004-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class FlowRenderKit extends RenderKitWrapper {
} }
private ResponseStateManager initResponseStateManager(ResponseStateManager wrapped) { private ResponseStateManager initResponseStateManager(ResponseStateManager wrapped) {
if (!JsfRuntimeInformation.isMyFacesPresent() && !JsfRuntimeInformation.isMyFacesInUse()) { if (!JsfRuntimeInformation.isMyFacesInUse()) {
return new FlowResponseStateManager(wrapped); return new FlowResponseStateManager(wrapped);
} }
Constructor<?> constructor; Constructor<?> constructor;

2
spring-faces/src/main/java/org/springframework/faces/webflow/JsfRuntimeInformation.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2014 the original author or authors. * Copyright 2004-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
spring-faces/src/main/java/org/springframework/faces/webflow/context/portlet/PortletExternalContextImpl.java
View File

@@ -127,7 +127,7 @@ public class PortletExternalContextImpl extends ExternalContext {
} }
private Flash createFlash() { private Flash createFlash() {
if (JsfRuntimeInformation.isMyFacesPresent()) { if (JsfRuntimeInformation.isMyFacesInUse()) {
return new MyFacesFlashFactory().newFlash(this); return new MyFacesFlashFactory().newFlash(this);
} else { } else {
return new MojarraFlashFactory().newFlash(this); return new MojarraFlashFactory().newFlash(this);