[jboss-cvs] JBossAS SVN: r57281 - branches/Branch_4_0/server/src/main/org/jboss/ejb

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2006-09-29 03:50:40 -0400 (Fri, 29 Sep 2006)
New Revision: 57281

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/ejb/EjbModule.java
Log:
fix for JBAS-3717

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/EjbModule.java	2006-09-29 07:48:46 UTC (rev 57280)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/EjbModule.java	2006-09-29 07:50:40 UTC (rev 57281)
@@ -278,8 +278,6 @@
 
    /**
     * Set the class loader of this deployment unit
-    *
-    * @param   name
     */
    public void setClassLoader(ClassLoader cl)
    {
@@ -408,7 +406,18 @@
          Container con = (Container) iter.next();
          if(con.getBeanMetaData().isEntity())
          {
-            ((EntityContainer)con).getPersistenceManager().start();
+            ClassLoader oldCl = SecurityActions.getContextClassLoader();
+            SecurityActions.setContextClassLoader(con.getClassLoader());
+
+            try
+            {
+               ((EntityContainer)con).getPersistenceManager().start();
+            }
+            finally
+            {
+               // Reset classloader
+               SecurityActions.setContextClassLoader(oldCl);
+            }
          }
       }