geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428000 - in /geronimo/sandbox/svkmerge/trunk: ./ modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Date Wed, 02 Aug 2006 14:15:45 GMT
Author: jdillon
Date: Wed Aug  2 07:15:44 2006
New Revision: 428000

URL: http://svn.apache.org/viewvc?rev=428000&view=rev
Log:
 r616@dyn456093 (orig r427725):  ammulder | 2006-08-01 13:52:39 -0700
 Merge GERONIMO-2259 to trunk
 

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Aug  2 07:15:44 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427714
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:427725

Modified: geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=428000&r1=427999&r2=428000&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
(original)
+++ geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Wed Aug  2 07:15:44 2006
@@ -179,6 +179,8 @@
             } else {
                 throw cause;
             }
+        } catch(NoSuchConfigException e) {
+            // The module isn't loaded -- that's OK
         }
         try {
             configurationManager.unloadConfiguration(configID);



Mime
View raw message