You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/18 15:05:23 UTC
svn commit: r649513 -
/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Author: bommel
Date: Fri Apr 18 06:05:22 2008
New Revision: 649513
URL: http://svn.apache.org/viewvc?rev=649513&view=rev
Log:
(MYFACES-1866) Avoid possible NullPointerException and NumberFormatException in JspStateManagerImpl.getServerStateId
Modified:
myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=649513&r1=649512&r2=649513&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Fri Apr 18 06:05:22 2008
@@ -213,10 +213,18 @@
if (log.isTraceEnabled()) log.trace("Exiting restoreComponentState");
}
- protected Integer getServerStateId(Object[] state)
- {
- return Integer.valueOf((String) state[JSF_SEQUENCE_INDEX], Character.MAX_RADIX);
- }
+ protected Integer getServerStateId(Object[] state)
+ {
+ if (state != null)
+ {
+ Object serverStateId = state[JSF_SEQUENCE_INDEX];
+ if (serverStateId != null)
+ {
+ return Integer.valueOf((String) serverStateId, Character.MAX_RADIX);
+ }
+ }
+ return null;
+ }
/**
* See getTreeStructureToSave.