geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1463715 - /geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
Date Tue, 02 Apr 2013 19:37:31 GMT
Author: gawor
Date: Tue Apr  2 19:37:31 2013
New Revision: 1463715

URL: http://svn.apache.org/r1463715
Log:
GERONIMO-6443: Try bundle resolution twice (a work-around)

Modified:
    geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java

Modified: geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1463715&r1=1463714&r2=1463715&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
(original)
+++ geronimo/server/branches/3.0/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
Tue Apr  2 19:37:31 2013
@@ -427,9 +427,14 @@ public class ApplicationGBean implements
         BundleContext context = bundle.getBundleContext();
         FrameworkWiring wiring = context.getBundle(0).adapt(FrameworkWiring.class);
         if (!wiring.resolveBundles(applicationBundles)) {
-            throw new BundleException("One or more bundles in " + getApplicationName() +
" application could not be resolved.");
+            LOG.debug("First resolution of application bundles failed.");
+            if (!wiring.resolveBundles(applicationBundles)) {
+                throw new BundleException("One or more bundles in " + getApplicationName()
+ " application could not be resolved.");
+            } else {
+                LOG.debug("Second resolution of application bundles was successful.");
+            }
         }
-        
+
         setApplicationState(ApplicationState.RESOLVED);
         setApplicationState(ApplicationState.STARTING);
         



Mime
View raw message