Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30F2F7B8E for ; Tue, 6 Sep 2011 17:37:50 +0000 (UTC) Received: (qmail 8169 invoked by uid 500); 6 Sep 2011 17:37:50 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 8092 invoked by uid 500); 6 Sep 2011 17:37:49 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 8085 invoked by uid 99); 6 Sep 2011 17:37:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 17:37:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 17:37:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D72D12388847; Tue, 6 Sep 2011 17:37:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1165766 - /geronimo/server/trunk/framework/modules/geronimo-main/src/main/java/org/apache/geronimo/main/FrameworkLauncher.java Date: Tue, 06 Sep 2011 17:37:27 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110906173727.D72D12388847@eris.apache.org> 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 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) {