[java-opensaml COMMIT] /trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jan  6 18:57:08 2013
New Revision: 3126

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3126&view=rev
Log:
FIx some annotations.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java?rev=3126&r1=3125&r2=3126&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/SecurityConfiguration.java Sun Jan  6 18:57:08 2013
@@ -111,7 +111,7 @@
      * @return an encryption algorithm URI, or null if no mapping is available
      */
     @Nullable public String getKeyTransportEncryptionAlgorithmURI(@Nonnull final String jcaAlgorithmName,
-            @Nullable final Integer keyLength, String wrappedKeyAlgorithm);
+            @Nullable final Integer keyLength, @Nullable final String wrappedKeyAlgorithm);
     
     /**
      * Get the key transport encryption algorithm URI for the encryption key contained within the specified credential.
@@ -121,7 +121,7 @@
      * @return an encryption algorithm URI mapping, or null if no mapping is available
      */
     @Nullable public String getKeyTransportEncryptionAlgorithmURI(@Nonnull final Credential credential,
-            @Nonnull final String wrappedKeyAlgorithm);
+            @Nullable final String wrappedKeyAlgorithm);
     
     /**
      * Get the encryption algorithm URI to be used when auto-generating random data encryption keys.