You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/12/06 15:44:31 UTC
svn commit: r1210948 -
/openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
Author: rmannibucau
Date: Tue Dec 6 14:44:31 2011
New Revision: 1210948
URL: http://svn.apache.org/viewvc?rev=1210948&view=rev
Log:
oops, little infinite loop in OSGi
Modified:
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
Modified: openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java?rev=1210948&r1=1210947&r2=1210948&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java (original)
+++ openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java Tue Dec 6 14:44:31 2011
@@ -41,6 +41,7 @@ public class Activator implements Bundle
private static final long TRACKER_TIMEOUT = 60000;
private OpenEJBInstance openejb;
+ private Object serviceManager;
public void start(BundleContext context) throws Exception {
LOGGER.info("Starting OpenEJB");
@@ -72,7 +73,7 @@ public class Activator implements Bundle
ServiceTracker serviceManagerTracker = null;
try {
serviceManagerTracker = getServiceManger(context);
- Object serviceManager = serviceManagerTracker.getService();
+ serviceManager = serviceManagerTracker.getService();
if (serviceManager == null) {
LOGGER.warn("can't find service manager");
}
@@ -103,18 +104,10 @@ public class Activator implements Bundle
public void stop(BundleContext context) throws Exception {
LOGGER.info("Stopping OpenEJB; openejb.isInitialized(): " + openejb.isInitialized());
- ServiceTracker serviceManager = null;
try {
- serviceManager = getServiceManger(context);
- invoke(serviceManager.getService(), "stop");
- } catch (InterruptedException ie) {
- LOGGER.warn("can't find service manager");
+ invoke(serviceManager, "stop");
} catch (Exception e) {
- LOGGER.error("can't start OpenEJB services", e);
- } finally {
- if (serviceManager != null) {
- serviceManager.close();
- }
+ LOGGER.error("can't stop OpenEJB services", e);
}
openejb = null;
@@ -134,6 +127,7 @@ public class Activator implements Bundle
} catch (NoSuchMethodException e) {
// ignored
}
+ current = current.getSuperclass();
}
if (mtd == null) {