diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-31 09:01:38 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-31 09:01:38 +0000 |
| commit | e4ceda540197333605b7bb0df6d73a5dc96076bf (patch) | |
| tree | 2b5c370e9f871fffddbe29deef070de10f31c642 /java/sca/modules | |
| parent | 5e8bc64747e9bf9dadd2cc654e4477e2f7dc18de (diff) | |
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@831524 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules')
| -rw-r--r-- | java/sca/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/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java index 3253e6c026..4e32d8bcad 100644 --- a/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java +++ b/java/sca/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) { |