[richfaces-svn-commits] JBoss Rich Faces SVN: r8810 - trunk/framework/impl/src/main/java/org/ajax4jsf/application.
Author: alexsmirnov
Date: 2008-05-28 13:18:32 -0400 (Wed, 28 May 2008)
New Revision: 8810
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
Log:
http://jira.jboss.com/jira/browse/RF-3576 was fixed
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-05-28
16:39:58 UTC (rev 8809)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/application/AjaxStateManager.java 2008-05-28
17:18:32 UTC (rev 8810)
@@ -30,7 +30,6 @@
import javax.faces.FactoryFinder;
import javax.faces.application.StateManager;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIViewRoot;
import javax.faces.context.ExternalContext;
@@ -40,7 +39,6 @@
import javax.faces.render.ResponseStateManager;
import org.ajax4jsf.context.AjaxContext;
-import org.ajax4jsf.event.AjaxPhaseListener;
import org.ajax4jsf.model.KeepAlive;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -316,7 +314,8 @@
// Save all objects form request map wich marked by @KeepAlive annotations
for (Entry<String, Object> requestEntry : requestMap.entrySet()) {
Object bean = requestEntry.getValue();
- if (bean.getClass().isAnnotationPresent(KeepAlive.class)) {
+ // check value for a NULL - http://jira.jboss.com/jira/browse/RF-3576
+ if (null != bean && bean.getClass().isAnnotationPresent(KeepAlive.class)) {
keepAliveBeans.put(requestEntry.getKey(), bean);
}
}