svn commit: r1417022 - in /cxf/trunk/rt/security/src: main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java

[coheigea]

Author: coheigea
Date: Tue Dec  4 16:30:44 2012
New Revision: 1417022

URL: http://svn.apache.org/viewvc?rev=1417022&view=rev
Log:
Fixed a bug with XACML Environments in a Request

Modified:
    
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
    
cxf/trunk/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java

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=1417022&r1=1417021&r2=1417022&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
 Tue Dec  4 16:30:44 2012
@@ -137,7 +137,7 @@ public class DefaultXACMLRequestBuilder 
         ActionType actionType = 
RequestComponentBuilder.createActionType(attributes);
         
         // Environment
-        EnvironmentType environmentType = null;
+        attributes.clear();
         if (sendDateTime) {
             DateTime dateTime = new DateTime();
             AttributeValueType environmentAttributeValue = 
@@ -149,10 +149,10 @@ public class DefaultXACMLRequestBuilder 
                         null,
                         Collections.singletonList(environmentAttributeValue)
                 );
-            attributes.clear();
             attributes.add(environmentAttribute);
-            environmentType = 
RequestComponentBuilder.createEnvironmentType(attributes);
         }
+        EnvironmentType environmentType = 
+            RequestComponentBuilder.createEnvironmentType(attributes);
         
         // Request
         RequestType request = 

Modified: 
cxf/trunk/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java?rev=1417022&r1=1417021&r2=1417022&view=diff
==============================================================================
--- 
cxf/trunk/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java
 (original)
+++ 
cxf/trunk/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java
 Tue Dec  4 16:30:44 2012
@@ -144,12 +144,12 @@ public class XACMLRequestBuilderTest ext
         RequestType request = 
             builder.createRequest(principal, 
Collections.singletonList("manager"), msg);
         assertNotNull(request);
-        assertNotNull(request.getEnvironment());
+        assertFalse(request.getEnvironment().getAttributes().isEmpty());
         
         ((DefaultXACMLRequestBuilder)builder).setSendDateTime(false);
         request = builder.createRequest(principal, 
Collections.singletonList("manager"), msg);
         assertNotNull(request);
-        assertNull(request.getEnvironment());
+        assertTrue(request.getEnvironment().getAttributes().isEmpty());
     }
     
 }