[java-xmltooling COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xml/encryption/Decrypte...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar  7 19:27:57 2014
New Revision: 820

URL: http://svn.shibboleth.net/view/java-xmltooling?rev=820&view=rev
Log:
JXT-108: Encrypter setKeyResolverCriteria() typo, should be getKeyResolverCriteria()

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/org/opensaml/xml/encryption/Decrypter.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/doc/RELEASE-NOTES.txt?rev=820&r1=819&r2=820&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Fri Mar  7 19:27:57 2014
@@ -1,3 +1,7 @@
+Changes in Release 1.4.2
+=============================================
+[JXT-108] - Encrypter setKeyResolverCriteria() typo, should be getKeyResolverCriteria()
+
 Changes in Release 1.4.1
 =============================================
 [JXT-102] - Decrypter should be defensive about Santuario and Java crypto classes throwing unchecked exceptions 

Modified: branches/REL_1/src/main/java/org/opensaml/xml/encryption/Decrypter.java
URL: http://svn.shibboleth.net/view/java-xmltooling/branches/REL_1/src/main/java/org/opensaml/xml/encryption/Decrypter.java?rev=820&r1=819&r2=820&view=diff
==============================================================================
--- branches/REL_1/src/main/java/org/opensaml/xml/encryption/Decrypter.java (original)
+++ branches/REL_1/src/main/java/org/opensaml/xml/encryption/Decrypter.java Fri Mar  7 19:27:57 2014
@@ -339,8 +339,19 @@
      * 
      * @return the static criteria set to use
      */
+    public CriteriaSet getKeyResolverCriteria() {
+        return resolverCriteria;
+    }
+    
+    /**
+     * Get the optional static set of criteria used when resolving credentials based on the KeyInfo of an EncryptedData
+     * element.
+     * 
+     * @return the static criteria set to use
+     * @deprecated due to typo, use {@link #getKeyResolverCriteria()}
+     */
     public CriteriaSet setKeyResolverCriteria() {
-        return resolverCriteria;
+        return getKeyResolverCriteria();
     }
 
     /**