geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1341728 - /geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Date Wed, 23 May 2012 02:24:11 GMT
Author: xiaming
Date: Wed May 23 02:24:10 2012
New Revision: 1341728

URL: http://svn.apache.org/viewvc?rev=1341728&view=rev
Log:
GERONIMO-6332 Check existing web context before removing it, to fix duplicated web context
issue, patch provided by xiezhi

Modified:
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=1341728&r1=1341727&r2=1341728&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
Wed May 23 02:24:10 2012
@@ -318,6 +318,12 @@ public class TomcatContainer implements 
         Context context = ctx.getContext();
 
         if (context != null) {
+            if (context.getParent() != null) {
+                Container existingContext = context.getParent().findChild(context.getName());
+                if(existingContext != context){
+                    return;
+                }
+            }
             if (context instanceof GeronimoStandardContext) {
                 GeronimoStandardContext stdctx = (GeronimoStandardContext) context;
 



Mime
View raw message