svn commit: r1482462 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Tue May 14 17:01:03 2013
New Revision: 1482462

URL: http://svn.apache.org/r1482462
Log:
using InjectableBeanManager to ensure we are serializable

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1482462&r1=1482461&r2=1482462&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
 Tue May 14 17:01:03 2013
@@ -65,6 +65,7 @@ import org.apache.tomee.common.ResourceF
 import org.apache.tomee.common.SystemComponentFactory;
 import org.apache.tomee.common.UserTransactionFactory;
 import org.apache.tomee.common.WsFactory;
+import org.apache.webbeans.container.InjectableBeanManager;
 import org.omg.CORBA.ORB;
 
 import javax.ejb.spi.HandleDelegate;
@@ -285,9 +286,9 @@ public class TomcatJndiBuilder {
             comp.rebind("HandleDelegate", new 
SystemComponentReference(HandleDelegate.class));
 
             if (webContext != null && webContext.getWebbeansContext() != null) 
{
-                comp.rebind("BeanManager", 
webContext.getWebbeansContext().getBeanManagerImpl());
+                comp.rebind("BeanManager", new 
InjectableBeanManager(webContext.getWebbeansContext().getBeanManagerImpl()));
             } else if (contextInfo != null) {
-                comp.rebind("BeanManager", 
cs.getAppContext(contextInfo.appInfo.appId).getBeanManager());
+                comp.rebind("BeanManager", new 
InjectableBeanManager(cs.getAppContext(contextInfo.appInfo.appId).getWebBeansContext().getBeanManagerImpl()));
             }
         } catch (Exception ignored) {
             ignored.printStackTrace();