geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r535367 - /geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Date Fri, 04 May 2007 20:00:51 GMT
Author: djencks
Date: Fri May  4 13:00:50 2007
New Revision: 535367

URL: http://svn.apache.org/viewvc?view=rev&rev=535367
Log:
GERONIMO-3140 workaround for multiple matches during app client deploy

Modified:
    geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java?view=diff&rev=535367&r1=535366&r2=535367
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
(original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeploymentContext.java
Fri May  4 13:00:50 2007
@@ -549,6 +549,11 @@
             configuration.findGBean(patterns);
             return null;
         } catch (GBeanNotFoundException e) {
+            //TODO bug!! GERONIMO-3140 Multiple matches may be caused by using an already-loaded
configuration rather than reloading one
+            // using the client_artifact_aliases.properties which e.g. remap the server tm
to the client tm.
+            if (e.hasMatches()) {
+                return null;
+            }
             return e.getMessage();
         }
     }



Mime
View raw message