[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xacml/policy/impl/IdRefe...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul  4 11:52:42 2012
New Revision: 1580

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1580&view=rev
Log:
[JOST-191] marshall IdReferenceType optional attributes 

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1580&r1=1579&r2=1580&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Jul  4 11:52:42 2012
@@ -1,6 +1,6 @@
 Changes in Release 2.5.4
 =============================================
-[JOST-191] - XACML code does not handle <SubjectAttributeDesignator/> or <XPathVersion/> Correctly
+[JOST-191] - Further Bugfixes to XACML\policy
 [JOST-190] - Backport some bugfixes from OpenSAML3
 [JOST-185] - Defaultbootstrap does not initialize the providers from the WS-Trust and WS-Policy schemas in openws
 [JOST-187] - Velocity initialization code uses an invalid key for the configuration properties set

Modified: branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java?rev=1580&r1=1579&r2=1580&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/IdReferenceTypeMarshaller.java Wed Jul  4 11:52:42 2012
@@ -41,10 +41,12 @@
         if(!DatatypeHelper.isEmpty(idReferenceType.getEarliestVersion())){
             domElement.setAttribute(IdReferenceType.EARLIEST_VERSION_ATTRIB_NAME,
                     idReferenceType.getEarliestVersion());
-        }else if(!DatatypeHelper.isEmpty(idReferenceType.getLatestVersion())){
+        }
+        if(!DatatypeHelper.isEmpty(idReferenceType.getLatestVersion())){
             domElement.setAttribute(IdReferenceType.LATEST_VERSION_ATTRIB_NAME,
                     idReferenceType.getLatestVersion());
-        }else if(!DatatypeHelper.isEmpty(idReferenceType.getVersion())){
+        }
+        if(!DatatypeHelper.isEmpty(idReferenceType.getVersion())){
             domElement.setAttribute(IdReferenceType.VERSION_ATTRIB_NAME,
                     idReferenceType.getVersion());
         }