You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/07/21 18:39:16 UTC
svn commit: r966305 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application:
ViewHandlerImpl.java jsp/JspStateManagerImpl.java jsp/JspViewHandlerImpl.java
Author: lu4242
Date: Wed Jul 21 16:39:15 2010
New Revision: 966305
URL: http://svn.apache.org/viewvc?rev=966305&view=rev
Log:
MYFACES-2754 MyFaces can attempt to create a new session after the response has been committed (revert changes)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=966305&r1=966304&r2=966305&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java Wed Jul 21 16:39:15 2010
@@ -164,7 +164,6 @@ public class ViewHandlerImpl extends Vie
{
super.initView(context);
}
- context.getAttributes().put(JspStateManagerImpl.JSP_VIEWHANDLER_IS_WRITING_STATE_ATTR, true);
}
/**
@@ -318,7 +317,6 @@ public class ViewHandlerImpl extends Vie
}else
{
//we're in a JSP, let the JSPStatemanager know that we need to actually write the state
- context.getAttributes().put(JspStateManagerImpl.JSP_IS_WRITING_STATE_ATTR, true);
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=966305&r1=966304&r2=966305&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Wed Jul 21 16:39:15 2010
@@ -179,16 +179,8 @@ public class JspStateManagerImpl extends
private static final int JSF_SEQUENCE_INDEX = 0;
- public static final String JSP_IS_WRITING_STATE_ATTR = "org.apache.myfaces.JSP_IS_WRITING_STATE";
-
- /**
- * Indicate that the current ViewHandler will advice through org.apache.myfaces.JSP_IS_WRITING_STATE var
- * that it is necessary to write the state.
- */
- public static final String JSP_VIEWHANDLER_IS_WRITING_STATE_ATTR = "org.apache.myfaces.JSP_VIEWHANDLER_IS_WRITING_STATE_ATTR";
-
private RenderKitFactory _renderKitFactory = null;
-
+
public JspStateManagerImpl()
{
if (log.isLoggable(Level.FINEST)) log.finest("New JspStateManagerImpl instance created");
@@ -473,14 +465,6 @@ public class JspStateManagerImpl extends
{
if (log.isLoggable(Level.FINEST)) log.finest("Entering saveSerializedView");
- if (isViewHandlerWritingState(facesContext))
- {
- if(!isWritingState(facesContext)){
- if (log.isLoggable(Level.FINEST)) log.finest("Exiting saveSerializedView - no state to save");
- return null;
- }
- }
-
checkForDuplicateIds(facesContext, facesContext.getViewRoot(), new HashSet<String>());
if (log.isLoggable(Level.FINEST)) log.finest("Processing saveSerializedView - Checked for duplicate Ids");
@@ -602,7 +586,7 @@ public class JspStateManagerImpl extends
//save state in response (client)
RenderKit renderKit = getRenderKitFactory().getRenderKit(facesContext, uiViewRoot.getRenderKitId());
ResponseStateManager responseStateManager = renderKit.getResponseStateManager();
-
+
if (isLegacyResponseStateManager(responseStateManager))
{
responseStateManager.writeState(facesContext, serializedView);
@@ -620,7 +604,7 @@ public class JspStateManagerImpl extends
state[1] = serializedView.getState();
responseStateManager.writeState(facesContext, state);
}
-
+
if (log.isLoggable(Level.FINEST)) log.finest("Exiting writeState");
}
@@ -980,19 +964,7 @@ public class JspStateManagerImpl extends
return true;
}
-
- private boolean isViewHandlerWritingState(FacesContext context)
- {
- Boolean viewHandlerWritingState = (Boolean)context.getAttributes().get(JSP_VIEWHANDLER_IS_WRITING_STATE_ATTR);
- return viewHandlerWritingState == null ? false : viewHandlerWritingState;
- }
-
- private boolean isWritingState(FacesContext context)
- {
- Boolean writingState = (Boolean)context.getAttributes().get(JSP_IS_WRITING_STATE_ATTR);
- return writingState == null ? false : writingState;
- }
-
+
protected static class SerializedViewCollection implements Serializable
{
private static final long serialVersionUID = -3734849062185115847L;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=966305&r1=966304&r2=966305&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Wed Jul 21 16:39:15 2010
@@ -125,13 +125,6 @@ public class JspViewHandlerImpl extends
if (log.isLoggable(Level.FINEST))
log.finest("New ViewHandler instance created");
}
-
- @Override
- public void initView(FacesContext context) throws FacesException
- {
- super.initView(context);
- context.getAttributes().put(JspStateManagerImpl.JSP_VIEWHANDLER_IS_WRITING_STATE_ATTR, true);
- }
/**
* @param viewHandlerSupport
@@ -560,8 +553,6 @@ public class JspViewHandlerImpl extends
public void writeState(FacesContext facesContext) throws IOException
{
StateManager stateManager = facesContext.getApplication().getStateManager();
- setWritingState(facesContext);
-
if (stateManager.isSavingStateInClient(facesContext))
{
// Only write state marker if javascript view state is disabled
@@ -575,10 +566,6 @@ public class JspViewHandlerImpl extends
stateManager.writeState(facesContext, new Object[2]);
}
}
-
- private void setWritingState(FacesContext context){
- context.getAttributes().put(JspStateManagerImpl.JSP_IS_WRITING_STATE_ATTR, true);
- }
/**
* Writes the response and replaces the state marker tags with the state information for the current context
@@ -689,4 +676,4 @@ public class JspViewHandlerImpl extends
}
}
}
-}
+}
\ No newline at end of file