You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/04/16 09:53:58 UTC

svn commit: r1326527 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java

Author: xiaming
Date: Mon Apr 16 07:53:57 2012
New Revision: 1326527

URL: http://svn.apache.org/viewvc?rev=1326527&view=rev
Log:
GERONIMO-5802 Revise the patch not to set load=false for failed module automatically, instead let user decide what to do next, for trunk

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1326527&r1=1326526&r2=1326527&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Mon Apr 16 07:53:57 2012
@@ -293,7 +293,11 @@ public class EmbeddedDaemon {
                                 } catch (Exception e) {
                                     if ( configModuleType != ConfigurationModuleType.SERVICE.getValue() ) {
                                         log.warn("Failed to start module " + configID + "; Cause by " + e.getCause());
-                                        configurationManager.unloadConfiguration(configID);
+                                        log.warn("Please try to correct the problem by referring to the logged exception. " +
+                                    		"If you want to bypass it in future restart, you can set load=\"false\" on " +
+                                    		"that module.");
+                                        // Only log warning and let user decide what action to take
+                                        //configurationManager.unloadConfiguration(configID);
                                         continue;
                                     }
                                 }