You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/07/29 17:33:55 UTC
svn commit: r1508102 - in
/cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml:
CXFMessageParser.java DefaultXACMLRequestBuilder.java
Author: coheigea
Date: Mon Jul 29 15:33:55 2013
New Revision: 1508102
URL: http://svn.apache.org/r1508102
Log:
Minor update
Modified:
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
Modified: cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java?rev=1508102&r1=1508101&r2=1508102&view=diff
==============================================================================
--- cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java (original)
+++ cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java Mon Jul 29 15:33:55 2013
@@ -38,7 +38,7 @@ public class CXFMessageParser {
}
public boolean isSOAPService() {
- return !(getWSDLService() == null || getWSDLOperation() == null);
+ return getWSDLOperation() != null;
}
public QName getWSDLOperation() {
Modified: cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java?rev=1508102&r1=1508101&r2=1508102&view=diff
==============================================================================
--- cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java (original)
+++ cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java Mon Jul 29 15:33:55 2013
@@ -90,12 +90,16 @@ public class DefaultXACMLRequestBuilder
QName serviceName = messageParser.getWSDLService();
QName operationName = messageParser.getWSDLOperation();
- resourceId = serviceName.toString() + "#";
- if (serviceName.getNamespaceURI() != null
- && serviceName.getNamespaceURI().equals(operationName.getNamespaceURI())) {
- resourceId += operationName.getLocalPart();
+ if (serviceName != null) {
+ resourceId = serviceName.toString() + "#";
+ if (serviceName.getNamespaceURI() != null
+ && serviceName.getNamespaceURI().equals(operationName.getNamespaceURI())) {
+ resourceId += operationName.getLocalPart();
+ } else {
+ resourceId += operationName.toString();
+ }
} else {
- resourceId += operationName.toString();
+ resourceId = operationName.toString();
}
} else {
resourceId = messageParser.getResourceURI(sendFullRequestURL);