diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-01 07:55:49 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-01 07:55:49 +0000 |
| commit | 048bc049cb199fcf37b57e36f55d58481c9e2c57 (patch) | |
| tree | 615a78cc7742b163ae376eea510948c60c10f4d6 /branches | |
| parent | 6fc6bd00f9c28b576013b1753a7c73cfca60662d (diff) | |
Merge r831524 from trunk to m4 to Update to not relocate a servlet if it already includes the context path in its mapping
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831652 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches')
| -rw-r--r-- | branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java index 3253e6c026..4e32d8bcad 100644 --- a/branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ b/branches/sca-java-2.0-M4/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java @@ -256,7 +256,9 @@ public class WebAppServletHost implements ServletHost { 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) { |