svn commit: r1306226 - in /santuario/xml-security-java/branches/1.4.x-fixes: CHANGELOG.txt src_unitTests/javax/xml/crypto/test/KeySelectors.java

[co...@apache.org]

Author: coheigea
Date: Wed Mar 28 09:33:00 2012
New Revision: 1306226

URL: http://svn.apache.org/viewvc?rev=1306226&view=rev
Log:
[SANTUARIO-306] - KeySelectors loop

Modified:
    santuario/xml-security-java/branches/1.4.x-fixes/CHANGELOG.txt
    santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/javax/xml/crypto/test/KeySelectors.java

Modified: santuario/xml-security-java/branches/1.4.x-fixes/CHANGELOG.txt
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/CHANGELOG.txt?rev=1306226&r1=1306225&r2=1306226&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/CHANGELOG.txt (original)
+++ santuario/xml-security-java/branches/1.4.x-fixes/CHANGELOG.txt Wed Mar 28 09:33:00 2012
@@ -1,6 +1,7 @@
 Changelog for "Apache xml-security" <http://santuario.apache.org/>
 
 New in v.1.4.7-SNAPSHOT:
+    Fixed SANTUARIO-306 - KeySelectors loop
     Fixed SANTUARIO-301 - Missing KeyInfo element when encrypting multiple elements.
     Fixed SANTUARIO-299: StringIndexOutOfBoundsException is thrown during reference verification (if URI = "#")
     Fixed SANTUARIO-295: XMLDSig XPathFilter2Transform bug involving intersect filter

Modified: santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/javax/xml/crypto/test/KeySelectors.java?rev=1306226&r1=1306225&r2=1306226&view=diff
==============================================================================
--- santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/branches/1.4.x-fixes/src_unitTests/javax/xml/crypto/test/KeySelectors.java Wed Mar 28 09:33:00 2012
@@ -100,7 +100,7 @@ public class KeySelectors {
 		    Object[] entries = xd.getContent().toArray();
 		    X509CRL crl = null;
 		    // Looking for CRL before finding certificates
-		    for (int i = 0; (i<entries.length&&crl != null); i++) {
+		    for (int i = 0; (i<entries.length&&crl == null); i++) {
 			if (entries[i] instanceof X509CRL) {
 			    crl = (X509CRL) entries[i];
 			}
@@ -293,7 +293,7 @@ public class KeySelectors {
 			}
 			return new SimpleKSResult(pk);
 		    } else if (xmlStructure instanceof RetrievalMethod) {
-			// Lookup the public key using the retrievel method.
+			// Lookup the public key using the retrieval method.
 			// NOTE: only X509Certificate type is supported.
 			RetrievalMethod rm = (RetrievalMethod) xmlStructure;
 			String type = rm.getType();