cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1508109 - /cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
Date Mon, 29 Jul 2013 15:49:15 GMT
Author: coheigea
Date: Mon Jul 29 15:49:15 2013
New Revision: 1508109

URL: http://svn.apache.org/r1508109
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=1508109&r1=1508108&r2=1508109&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:49:15 2013
@@ -201,8 +201,10 @@ public class DefaultXACMLRequestBuilder 
         if (isSoapService) {
             // WSDL Service
             QName wsdlService = getWSDLService(message);
-            attributes.add(createAttribute(XACMLConstants.RESOURCE_WSDL_SERVICE_ID, XACMLConstants.XS_STRING,
null,
+            if (wsdlService != null) {
+                attributes.add(createAttribute(XACMLConstants.RESOURCE_WSDL_SERVICE_ID, XACMLConstants.XS_STRING,
null,
                                            wsdlService.toString()));
+            }
             
             // WSDL Operation
             QName wsdlOperation = getWSDLOperation(message);



Mime
View raw message