myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1409426 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
Date Wed, 14 Nov 2012 21:33:51 GMT
Author: lu4242
Date: Wed Nov 14 21:33:50 2012
New Revision: 1409426

URL: http://svn.apache.org/viewvc?rev=1409426&view=rev
Log:
MYFACES-3638 NPE in ServerSideStateCacheImpl (apply alternate fix, just with a check for null
before viewId.hashCode() call)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java?rev=1409426&r1=1409425&r2=1409426&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java
Wed Nov 14 21:33:50 2012
@@ -1410,7 +1410,7 @@ class ServerSideStateCacheImpl extends S
         {
             if (context.isProjectStage(ProjectStage.Production))
             {
-                return new IntIntSerializedViewKey(viewId.hashCode(), key);
+                return new IntIntSerializedViewKey(viewId == null ? 0 : viewId.hashCode(),
key);
             }
             else
             {
@@ -1440,7 +1440,7 @@ class ServerSideStateCacheImpl extends S
         {
             if (context.isProjectStage(ProjectStage.Production))
             {
-                return new IntByteArraySerializedViewKey(viewId.hashCode(), key);
+                return new IntByteArraySerializedViewKey(viewId == null ? 0 : viewId.hashCode(),
key);
             }
             else
             {



Mime
View raw message