summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-12 07:26:14 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-12 07:26:14 +0000
commit4793edeb2e0b18059c965759c78f06c6b77faf67 (patch)
tree5ffdf907b361c82ff596dea242083b39a6d5700a
parent9203a2f808c48bc10f83036c41c04f657e8fd8cc (diff)
Fix so that registering servlets with a * suffix in the path works
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1134878 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
index 643599afb8..467fcf8fbd 100644
--- a/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
+++ b/sca-java-2.x/trunk/modules/host-http-osgi/src/main/java/org/apache/tuscany/sca/http/osgi/OSGiServletHost.java
@@ -116,6 +116,11 @@ public class OSGiServletHost implements ServletHost, BundleActivator {
suri = contextPath + suri;
}
+ // The OSGi HTTP service doesn't use an aster for sub-paths so strip it off
+ if (suri.endsWith("/*")) {
+ suri = suri.substring(0, suri.length()-2);
+ }
+
// In a webapp just use the given path and ignore the host and port
// as they are fixed by the Web container
try {