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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jan  6 21:13:10 2013
New Revision: 3128

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3128&view=rev
Log:
At least one impl of interface returns nothing.

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

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java?rev=3128&r1=3127&r2=3128&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoGenerator.java Sun Jan  6 21:13:10 2013
@@ -17,7 +17,6 @@
 
 package org.opensaml.xmlsec.keyinfo;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.security.SecurityException;
@@ -34,9 +33,9 @@
      * Generate a new KeyInfo object based on keying material and other information within a credential. 
      * 
      * @param credential the credential containing keying material and possibly other information
-     * @return a new KeyInfo object
+     * @return a new KeyInfo object or null if nothing was generated
      * @throws SecurityException thrown if there is any error generating the new KeyInfo from the credential
      */
-    @Nonnull public KeyInfo generate(@Nullable final Credential credential) throws SecurityException;
+    @Nullable public KeyInfo generate(@Nullable final Credential credential) throws SecurityException;
 
 }