You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2011/04/12 19:43:02 UTC
svn commit: r1091517 -
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
Author: sobryan
Date: Tue Apr 12 17:43:02 2011
New Revision: 1091517
URL: http://svn.apache.org/viewvc?rev=1091517&view=rev
Log:
TRINIDAD-2059 - Patch submitted by Volker Malzahn
Thanks for the submission
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java?rev=1091517&r1=1091516&r2=1091517&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java Tue Apr 12 17:43:02 2011
@@ -276,32 +276,35 @@ public class CoreResponseStateManager ex
// Nope, let's look for a regular state field
else
{
- StringReader sr = new StringReader(stateString);
- BufferedReader br = new BufferedReader(sr);
- Base64InputStream b64_in = new Base64InputStream(br);
-
-
- try
- {
- ObjectInputStream ois;
- ois = new ObjectInputStreamResolveClass( new GZIPInputStream( b64_in, _BUFFER_SIZE ));
-
- Object structure = ois.readObject();
- Object state = ois.readObject();
- ois.close();
- view = new Object[]{structure, state};
- }
- catch (OptionalDataException ode)
- {
- _LOG.severe(ode);
- }
- catch (ClassNotFoundException cnfe)
- {
- _LOG.severe(cnfe);
- }
- catch (IOException ioe)
+ if (stateString != null)
{
- _LOG.severe(ioe);
+ StringReader sr = new StringReader(stateString);
+ BufferedReader br = new BufferedReader(sr);
+ Base64InputStream b64_in = new Base64InputStream(br);
+
+
+ try
+ {
+ ObjectInputStream ois;
+ ois = new ObjectInputStreamResolveClass( new GZIPInputStream( b64_in, _BUFFER_SIZE ));
+
+ Object structure = ois.readObject();
+ Object state = ois.readObject();
+ ois.close();
+ view = new Object[]{structure, state};
+ }
+ catch (OptionalDataException ode)
+ {
+ _LOG.severe(ode);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ _LOG.severe(cnfe);
+ }
+ catch (IOException ioe)
+ {
+ _LOG.severe(ioe);
+ }
}
}