You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/09/06 19:37:27 UTC
svn commit: r1165766 -
/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
Author: gawor
Date: Tue Sep 6 17:37:27 2011
New Revision: 1165766
URL: http://svn.apache.org/viewvc?rev=1165766&view=rev
Log:
GERONIMO-6151: Geronimo does not start with JRockit JVM
Modified:
geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
Modified: geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java?rev=1165766&r1=1165765&r2=1165766&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java Tue Sep 6 17:37:27 2011
@@ -163,6 +163,10 @@ public class FrameworkLauncher {
}
});
+ launchOSGiFramework();
+ }
+
+ private void launchOSGiFramework() throws Exception {
// Start up the OSGI framework
ServiceLoader<FrameworkFactory> loader = ServiceLoader.load(FrameworkFactory.class);
FrameworkFactory factory = loader.iterator().next();
@@ -179,7 +183,6 @@ public class FrameworkLauncher {
startBundles(bundleContext, startList);
framework.start();
-
}
public void destroy(boolean await) {