You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/10/31 10:01:38 UTC
svn commit: r831524 -
/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Author: antelder
Date: Sat Oct 31 09:01:38 2009
New Revision: 831524
URL: http://svn.apache.org/viewvc?rev=831524&view=rev
Log:
Update to not relocate a servlet if it already includes the context path in its mapping
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified: tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=831524&r1=831523&r2=831524&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (original)
+++ tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Sat Oct 31 09:01:38 2009
@@ -256,7 +256,9 @@
List<String> oldServletURIs = new ArrayList<String>();
for (String oldServletURI : servlets.keySet()) {
if (oldServletURI.startsWith(oldContextPath)) {
- oldServletURIs.add(oldServletURI);
+ if (!oldServletURI.startsWith(contextPath)) {
+ oldServletURIs.add(oldServletURI);
+ }
}
}
for (String oldURI : oldServletURIs) {