svn commit: r1508107 - /cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java

[coheigea]

Author: coheigea
Date: Mon Jul 29 15:45:52 2013
New Revision: 1508107

URL: http://svn.apache.org/r1508107
Log:
Minor update


Conflicts:
        
rt/security/src/main/java/org/apache/cxf/rt/security/xacml/CXFMessageParser.java

Modified:
    
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java

Modified: 
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java?rev=1508107&r1=1508106&r2=1508107&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
 Mon Jul 29 15:45:52 2013
@@ -180,12 +180,16 @@ public class DefaultXACMLRequestBuilder 
             QName serviceName = getWSDLService(message);
             QName operationName = getWSDLOperation(message);
             
-            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 = getResourceURI(message, sendFullRequestURL);
@@ -254,7 +258,7 @@ public class DefaultXACMLRequestBuilder 
     }
     
     private boolean isSOAPService(Message message) {
-        return !(getWSDLService(message) == null || getWSDLOperation(message) 
== null);
+        return getWSDLOperation(message) != null;
     }
 
     private QName getWSDLOperation(Message message) {