Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes AMQ-3130 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1057833 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2011-01-11 20:16:17 +00:00
parent 5ca9763343
commit 921d6ca25d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
activemq-core/src/main/java/org/apache/activemq/util/osgi/Activator.java
View File

@ -26,6 +26,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.net.URL;
import org.apache.activemq.Service;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.discovery.DiscoveryAgent;
import org.apache.activemq.util.FactoryFinder;
import org.apache.activemq.util.FactoryFinder.ObjectFactory;
import org.apache.commons.logging.LogFactory;
@ -63,6 +67,7 @@ public class Activator implements BundleActivator, SynchronousBundleListener, Ob
debug("activating");
this.bundleContext = bundleContext;
debug("checking existing bundles");
bundleContext.addBundleListener(this);
for (Bundle bundle : bundleContext.getBundles()) {
if (bundle.getState() == Bundle.RESOLVED || bundle.getState() == Bundle.STARTING ||
bundle.getState() == Bundle.ACTIVE || bundle.getState() == Bundle.STOPPING) {
@ -197,9 +202,15 @@ public class Activator implements BundleActivator, SynchronousBundleListener, Ob
}
private boolean isImportingUs(Bundle bundle) {
return isImportingClass(bundle, Service.class)
|| isImportingClass(bundle, Transport.class)
|| isImportingClass(bundle, DiscoveryAgent.class)
|| isImportingClass(bundle, PersistenceAdapter.class);
}
private boolean isImportingClass(Bundle bundle, Class clazz) {
try {
// If that bundle can load our classes.. then it must be importing us.
return bundle.loadClass(Activator.class.getName())==Activator.class;
return bundle.loadClass(clazz.getName())==clazz;
} catch (ClassNotFoundException e) {
return false;
}