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 B984F9C54 for ; Mon, 16 Apr 2012 07:53:33 +0000 (UTC) Received: (qmail 75247 invoked by uid 500); 16 Apr 2012 07:53:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 75140 invoked by uid 500); 16 Apr 2012 07:53:32 -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 75083 invoked by uid 99); 16 Apr 2012 07:53:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2012 07:53:31 +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; Mon, 16 Apr 2012 07:53:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0848523889D5; Mon, 16 Apr 2012 07:53:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1326524 - /geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Date: Mon, 16 Apr 2012 07:53:07 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120416075308.0848523889D5@eris.apache.org> Author: xiaming Date: Mon Apr 16 07:53:07 2012 New Revision: 1326524 URL: http://svn.apache.org/viewvc?rev=1326524&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 Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1326524&r1=1326523&r2=1326524&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java (original) +++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Mon Apr 16 07:53:07 2012 @@ -242,7 +242,11 @@ public class EmbeddedDaemon implements M } 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; } }