[webbeans-commits] Webbeans SVN: r2402 - ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Apr 14 11:40:23 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-04-14 11:40:23 -0400 (Tue, 14 Apr 2009)
New Revision: 2402
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
minor
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-14 14:06:33 UTC (rev 2401)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-14 15:40:23 UTC (rev 2402)
@@ -84,10 +84,17 @@
*/
protected BeanStore restoreSessionContext(HttpSession session)
{
- BeanStore sessionBeanStore = new HttpSessionBeanStore(session);
- super.restoreSession(session.getId(), sessionBeanStore);
- CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
- return sessionBeanStore;
+ if (session != null)
+ {
+ BeanStore sessionBeanStore = new HttpSessionBeanStore(session);
+ super.restoreSession(session.getId(), sessionBeanStore);
+ CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
+ return sessionBeanStore;
+ }
+ else
+ {
+ return null;
+ }
}
/**
@@ -104,7 +111,7 @@
BeanStore beanStore = new ConcurrentHashMapBeanStore();
request.setAttribute(REQUEST_ATTRIBUTE_NAME, beanStore);
super.beginRequest(request.getRequestURI(), beanStore);
- restoreSessionContext(request.getSession());
+ restoreSessionContext(request.getSession(false));
}
}
More information about the weld-commits
mailing list