Fixed ERRAI-795: Errai Security doesn't work with JSR-356 WebSockets

Author: csadilek

errai-bus-websocket/errai-bus-jsr356-websocket-weld/src/main/java/org/jboss/errai/bus/server/websocket/jsr356/weld/CdiDelegationListener.java

@@ -1,5 +1,10 @@
 package org.jboss.errai.bus.server.websocket.jsr356.weld;
 
+import javax.inject.Inject;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
 import org.jboss.errai.bus.server.websocket.jsr356.channel.ErraiChannelFactory;
 import org.jboss.errai.bus.server.websocket.jsr356.filter.FilterLookup;
 import org.jboss.errai.bus.server.websocket.jsr356.weld.channel.CdiErraiChannelFactory;
@@ -9,15 +14,10 @@
 import org.jboss.errai.bus.server.websocket.jsr356.weld.session.WeldSessionScopeAdapter;
 import org.jboss.weld.context.bound.BoundConversationContext;
 import org.jboss.weld.context.bound.BoundRequestContext;
-import org.jboss.weld.context.bound.BoundSessionContext;
+import org.jboss.weld.manager.BeanManagerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
-
 /**
  * @author Michel Werren
  */
@@ -26,9 +26,6 @@ public class CdiDelegationListener implements ServletContextListener {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(CdiDelegationListener.class.getName());
 
-  @Inject
-  private BoundSessionContext boundSessionContext;
-
   @Inject
   private BoundRequestContext boundRequestContext;
 
@@ -37,11 +34,15 @@ public class CdiDelegationListener implements ServletContextListener {
 
   @Inject
   private CdiFilterLookup cdiFilterLookup;
-
+  
+  @Inject
+  private BeanManagerImpl beanManager;
+  
   @Override
   public void contextInitialized(ServletContextEvent sce) {
+    
     WeldConversationScopeAdapter.init(boundConversationContext);
-    WeldSessionScopeAdapter.init(boundSessionContext);
+    WeldSessionScopeAdapter.init(beanManager);
     WeldRequestScopeAdapter.init(boundRequestContext);
 
     ErraiChannelFactory.registerDelegate(CdiErraiChannelFactory.getInstance());