You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ma...@apache.org on 2011/06/20 12:18:49 UTC
svn commit: r1137587 - in /aries/trunk:
jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/
jpa/jpa-container/src/test/java/org/apache/aries/util/
util/src/main/java/org/apache/aries/util/
Author: mahrwald
Date: Mon Jun 20 10:18:49 2011
New Revision: 1137587
URL: http://svn.apache.org/viewvc?rev=1137587&view=rev
Log:
ARIES-582: Remove BundleDelegatingClassLoader from the JPA component and use aries.util facilities instead.
Removed:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/BundleDelegatingClassLoader.java
Modified:
aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java
aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java
aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
Modified: aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java?rev=1137587&r1=1137586&r2=1137587&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java (original)
+++ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java Mon Jun 20 10:18:49 2011
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
import javax.persistence.SharedCacheMode;
import javax.persistence.ValidationMode;
@@ -36,6 +37,7 @@ import org.apache.aries.jpa.container.an
import org.apache.aries.jpa.container.parsing.ParsedPersistenceUnit;
import org.apache.aries.jpa.container.weaving.impl.TransformerRegistry;
import org.apache.aries.jpa.container.weaving.impl.TransformerRegistryFactory;
+import org.apache.aries.util.AriesFrameworkUtil;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
@@ -47,12 +49,13 @@ public class PersistenceUnitInfoImpl imp
private final ParsedPersistenceUnit unit;
- private final BundleDelegatingClassLoader cl;
-
private final ServiceReference providerRef;
private ClassTransformer transformer;
+ // initialize it lazily because we create a PersistenceUnitInfoImpl when the bundle is INSTALLED state
+ private final AtomicReference<ClassLoader> cl = new AtomicReference<ClassLoader>();
+
/** Logger */
private static final Logger _logger = LoggerFactory.getLogger("org.apache.aries.jpa.container");
@@ -61,7 +64,6 @@ public class PersistenceUnitInfoImpl imp
bundle = b;
unit = parsedData;
this.providerRef = providerRef;
- cl = new BundleDelegatingClassLoader(b);
}
public synchronized void addTransformer(ClassTransformer arg0) {
@@ -82,7 +84,12 @@ public class PersistenceUnitInfoImpl imp
}
public ClassLoader getClassLoader() {
- return cl;
+ if (cl.get() == null) {
+ // use forced because for even for a resolved bundle we could otherwise get null
+ cl.compareAndSet(null, AriesFrameworkUtil.getClassLoaderForced(bundle));
+ }
+
+ return cl.get();
}
@SuppressWarnings("unchecked")
@@ -137,7 +144,8 @@ public class PersistenceUnitInfoImpl imp
}
public ClassLoader getNewTempClassLoader() {
- return new TempBundleDelegatingClassLoader(bundle, new BundleDelegatingClassLoader(providerRef.getBundle()));
+ ClassLoader cl = AriesFrameworkUtil.getClassLoader(providerRef.getBundle());
+ return new TempBundleDelegatingClassLoader(bundle, cl);
}
public DataSource getNonJtaDataSource() {
Modified: aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java?rev=1137587&r1=1137586&r2=1137587&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java (original)
+++ aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java Mon Jun 20 10:18:49 2011
@@ -18,10 +18,12 @@
*/
package org.apache.aries.util;
+import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceRegistration;
/**
- * A fake class for testing
+ * A fake class for testing. We currently need this because the real AriesFrameworkUtil includes multiple
+ * layers of static initializers that blow up when not running in a proper OSGi framework.
*/
public final class AriesFrameworkUtil
{
@@ -43,4 +45,15 @@ public final class AriesFrameworkUtil
}
}
}
+
+ public static ClassLoader getClassLoader(Bundle b) {
+ // dummy implementation
+ return null;
+ }
+
+ public static ClassLoader getClassLoaderForced(Bundle b)
+ {
+ // dummy implementation
+ return null;
+ }
}
Modified: aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java
URL: http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java?rev=1137587&r1=1137586&r2=1137587&view=diff
==============================================================================
--- aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java (original)
+++ aries/trunk/util/src/main/java/org/apache/aries/util/AriesFrameworkUtil.java Mon Jun 20 10:18:49 2011
@@ -48,7 +48,7 @@ public final class AriesFrameworkUtil
* their is no such classloader, or if it cannot obtain the classloader for the bundle.
*
* @param b the bundle whose classloader is desired.
- * @return the classloader if found, or null.
+ * @return the classloader if found, or null if for example the bundle is in INSTALLED or UNINSTALLED state
*/
public static ClassLoader getClassLoader(Bundle b)
{