You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/04/08 20:49:55 UTC

svn commit: r932060 - /incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java

Author: jbohn
Date: Thu Apr  8 18:49:55 2010
New Revision: 932060

URL: http://svn.apache.org/viewvc?rev=932060&view=rev
Log:
ARIES-158 - remove hack for jpa classloader that is now fixed in openjpa-2.0.0-beta3 - tpatch by Donald Woods

Modified:
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java

Modified: incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java?rev=932060&r1=932059&r2=932060&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java (original)
+++ incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java Thu Apr  8 18:49:55 2010
@@ -57,27 +57,7 @@ public class PersistenceUnitInfoImpl imp
     bundle = b;
     unit = parsedData;
     this.providerRef = providerRef;
-    //Override the default behaviour until OPENJPA-1491 is fixed, remove the inner class when
-    //it is
-    cl = new BundleDelegatingClassLoader(b){
-
-      @Override
-      protected Class<?> findClass(String className)
-          throws ClassNotFoundException {
-        try {
-         return super.findClass(className);
-        } catch (ClassNotFoundException cnfe) {
-          if("org.apache.openjpa.jdbc.kernel.JDBCBrokerFactory".equals(className))
-            try{
-              return providerRef.getBundle().loadClass(className);
-            } catch (ClassNotFoundException cnfe2) {
-              
-            }
-            throw cnfe;
-        }
-      }
-    };
-    //End temporary fix for OPENJPA-1491
+    cl = new BundleDelegatingClassLoader(b);
   }
   
   public void addTransformer(ClassTransformer arg0) {