You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/04/25 14:41:57 UTC
svn commit: r1475726 -
/tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
Author: rmannibucau
Date: Thu Apr 25 12:41:57 2013
New Revision: 1475726
URL: http://svn.apache.org/r1475726
Log:
TOMEE-911 @WebService in ROOT.war - context not found
Modified:
tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
Modified: tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java?rev=1475726&r1=1475725&r2=1475726&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java (original)
+++ tomee/tomee/trunk/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java Thu Apr 25 12:41:57 2013
@@ -183,7 +183,12 @@ public class TomcatWsRegistry implements
if (!root.startsWith("/")) {
root = '/' + root;
}
- Context webAppContext = (Context) host.findChild(root);
+
+ Context webAppContext = Context.class.cast(host.findChild(root));
+ if (webAppContext == null && "/".equals(root)) {
+ webAppContext = Context.class.cast(host.findChild(root.substring(1)));
+ }
+
if (webAppContext != null) {
// sub context = '/' means the service address is provided by webservices
if (WEBSERVICE_SUB_CONTEXT.equals("/") && path.startsWith("/")) {