svn commit: r1385240 - /openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java

[rmannibucau]

Author: rmannibucau
Date: Sun Sep 16 10:11:03 2012
New Revision: 1385240

URL: http://svn.apache.org/viewvc?rev=1385240&view=rev
Log:
new owb api

Modified:
    
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java

Modified: 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java?rev=1385240&r1=1385239&r2=1385240&view=diff
==============================================================================
--- 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java
 (original)
+++ 
openejb/branches/openejb-4.1.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/WebBeansListener.java
 Sun Sep 16 10:11:03 2012
@@ -196,9 +196,9 @@ public class WebBeansListener implements
 
     @Override
     public void sessionDidActivate(HttpSessionEvent event) {
-        if (failoverService.isSupportFailOver() || 
failoverService.isSupportPassivation()) {
+        if (failoverService != null && (failoverService.isSupportFailOver() || 
failoverService.isSupportPassivation())) {
             HttpSession session = event.getSession();
-            failoverService.restoreBeans(session);
+            failoverService.sessionDidActivate(session);
         }
     }