geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428836 - in /geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src: ./ java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Date Fri, 04 Aug 2006 18:36:03 GMT
Author: jdillon
Date: Fri Aug  4 11:36:03 2006
New Revision: 428836

URL: http://svn.apache.org/viewvc?rev=428836&view=rev
Log:
 r631@jason-dillons-computer (orig r428000):  jdillon | 2006-08-02 07:15:44 -0700
  r616@dyn456093 (orig r427725):  ammulder | 2006-08-01 13:52:39 -0700
  Merge GERONIMO-2259 to trunk
  
 

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

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  4 11:36:03 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:427996
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/deploy-jsr88/src:428000

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=428836&r1=428835&r2=428836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Fri Aug  4 11:36:03 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