You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ro...@apache.org on 2008/07/07 20:35:20 UTC
svn commit: r674580 -
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java
Author: rott
Date: Mon Jul 7 11:35:19 2008
New Revision: 674580
URL: http://svn.apache.org/viewvc?rev=674580&view=rev
Log:
service-name-pattern and port-name-pattern should be compared using qname prefix, not namespace. See BaseHandlerResolver.doesPatternMatch code comments for all the info you need
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java?rev=674580&r1=674579&r2=674580&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/spi/handler/BaseHandlerResolver.java Mon Jul 7 11:35:19 2008
@@ -120,14 +120,15 @@
if (pattern == null)
return true;
// build up the strings according to the regular expression defined at http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd
- String portInfoNamespaceURI = portInfoQName.getNamespaceURI();
+ // use the prefix, not the literal namespace
+ String portInfoPrefix = portInfoQName.getPrefix();
String portInfoLocalPart = portInfoQName.getLocalPart();
- String portInfoString = ((portInfoNamespaceURI == null) || (portInfoNamespaceURI.equals(""))) ? "" : portInfoNamespaceURI + ":";
+ String portInfoString = ((portInfoPrefix == null) || (portInfoPrefix.equals(""))) ? "" : portInfoPrefix + ":";
portInfoString += portInfoLocalPart;
- String patternStringNamespaceURI = pattern.getNamespaceURI();
+ String patternStringPrefix = pattern.getPrefix();
String patternInfoLocalPart = pattern.getLocalPart();
- String patternString = ((patternStringNamespaceURI == null) || (patternStringNamespaceURI.equals(""))) ? "" : patternStringNamespaceURI + ":";
+ String patternString = ((patternStringPrefix == null) || (patternStringPrefix.equals(""))) ? "" : patternStringPrefix + ":";
patternString += patternInfoLocalPart;
/*