You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:21:10 UTC
[sling-org-apache-sling-commons-fsclassloader] 25/28: SLING-2617 :
Make sure the dynamic class loader used as the parent to the repository
class loader is acquired for the same bundle which acquired the
ClassLoaderWriter
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.fsclassloader-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-fsclassloader.git
commit 69e82aedfd4dee0a91ddce1a69536860215d7357
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 4 08:30:07 2013 +0000
SLING-2617 : Make sure the dynamic class loader used as the parent to the repository class loader is acquired for the same bundle which acquired the ClassLoaderWriter
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/fsclassloader@1489332 13f79535-47bb-0310-9956-ffa450edef68
---
.../fsclassloader/impl/FSClassLoaderProvider.java | 109 +++++++++++++++------
1 file changed, 81 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java b/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java
index 48fd6b5..9fab691 100644
--- a/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java
+++ b/src/main/java/org/apache/sling/commons/fsclassloader/impl/FSClassLoaderProvider.java
@@ -28,12 +28,17 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.classloader.ClassLoaderWriter;
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentContext;
/**
@@ -42,8 +47,8 @@ import org.osgi.service.component.ComponentContext;
*
*/
@Component
-@Service(value={ClassLoaderWriter.class})
-@Property( name="service.ranking", intValue=100)
+@Service(value={ClassLoaderWriter.class}, serviceFactory = true)
+@Property( name=Constants.SERVICE_RANKING, intValue=100)
public class FSClassLoaderProvider
implements ClassLoaderWriter {
@@ -56,8 +61,73 @@ public class FSClassLoaderProvider
/** Current class loader */
private FSDynamicClassLoader loader;
- @Reference
- private DynamicClassLoaderManager dynamicClassLoaderManager;
+ @Reference(
+ referenceInterface = DynamicClassLoaderManager.class,
+ bind = "bindDynamicClassLoaderManager",
+ unbind = "unbindDynamicClassLoaderManager")
+ private ServiceReference dynamicClassLoaderManager;
+
+ /** The bundle asking for this service instance */
+ private Bundle callerBundle;
+
+ /**
+ * Activate this component.
+ * Create the root directory.
+ * @param componentContext
+ * @throws MalformedURLException
+ */
+ @Activate
+ protected void activate(final ComponentContext componentContext) throws MalformedURLException {
+ // get the file root
+ this.root = new File(componentContext.getBundleContext().getDataFile(""), "classes");
+ this.root.mkdirs();
+ this.rootURL = this.root.toURI().toURL();
+ this.callerBundle = componentContext.getUsingBundle();
+ }
+
+ /**
+ * Deactivate this component.
+ * Create the root directory.
+ */
+ @Deactivate
+ protected void deactivate() {
+ this.root = null;
+ this.rootURL = null;
+ this.destroyClassLoader();
+ }
+
+ /**
+ * Called to handle binding the DynamicClassLoaderManager service
+ * reference
+ */
+ @SuppressWarnings("unused")
+ private void bindDynamicClassLoaderManager(final ServiceReference ref) {
+ this.dynamicClassLoaderManager = ref;
+ }
+
+ /**
+ * Called to handle unbinding of the DynamicClassLoaderManager service
+ * reference
+ */
+ @SuppressWarnings("unused")
+ private void unbindDynamicClassLoaderManager(final ServiceReference ref) {
+ if (this.dynamicClassLoaderManager == ref) {
+ this.dynamicClassLoaderManager = null;
+ }
+ }
+
+ private void destroyClassLoader() {
+ final ClassLoader rcl = this.loader;
+ if (rcl != null) {
+ this.loader = null;
+
+ final ServiceReference localDynamicClassLoaderManager = this.dynamicClassLoaderManager;
+ final Bundle localCallerBundle = this.callerBundle;
+ if ( localDynamicClassLoaderManager != null && localCallerBundle != null ) {
+ localCallerBundle.getBundleContext().ungetService(localDynamicClassLoaderManager);
+ }
+ }
+ }
/**
* @see org.apache.sling.commons.classloader.ClassLoaderWriter#getClassLoader()
@@ -65,7 +135,13 @@ public class FSClassLoaderProvider
public ClassLoader getClassLoader() {
synchronized ( this ) {
if ( loader == null || !loader.isLive() ) {
- loader = new FSDynamicClassLoader(new URL[] {this.rootURL}, this.dynamicClassLoaderManager.getDynamicClassLoader());
+ this.destroyClassLoader();
+ // get the dynamic class loader for the bundle using this
+ // class loader writer
+ final DynamicClassLoaderManager dclm = (DynamicClassLoaderManager) this.callerBundle.getBundleContext().getService(
+ this.dynamicClassLoaderManager);
+
+ loader = new FSDynamicClassLoader(new URL[] {this.rootURL}, dclm.getDynamicClassLoader());
}
return this.loader;
}
@@ -180,27 +256,4 @@ public class FSClassLoaderProvider
// fallback to "non-existant" in case of problems
return -1;
}
-
- /**
- * Activate this component.
- * Create the root directory.
- * @param componentContext
- * @throws MalformedURLException
- */
- protected void activate(final ComponentContext componentContext) throws MalformedURLException {
- // get the file root
- this.root = new File(componentContext.getBundleContext().getDataFile(""), "classes");
- this.root.mkdirs();
- this.rootURL = this.root.toURI().toURL();
- }
-
- /**
- * Deactivate this component.
- * Create the root directory.
- * @param componentContext
- */
- protected void deactivate(final ComponentContext componentContext) {
- this.root = null;
- this.rootURL = null;
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.