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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 14 21:05:26 2014
New Revision: 3703

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3703&view=rev
Log:
Another tweak to lookup for KeyInfoGeneratorFactory lookup.

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

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java?rev=3703&r1=3702&r2=3703&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java Fri Mar 14 21:05:26 2014
@@ -168,13 +168,15 @@
                 log.debug("Manger with name '{}' was not registered, using default manager", name);
                 manager = defaultManager;
             } else {
-                throw new IllegalArgumentException("Manager with name '" + name + "' does not exist");
+                log.warn("Manager with name '{}' was not registered, and 'useDefaultManager' is false", name);
+                return null;
             }
         }
             
         KeyInfoGeneratorFactory factory = manager.getFactory(credential);
         if (factory == null) {
             if (useDefaultManager && manager != defaultManager) {
+                log.debug("Factory not found in manager with name '{}', attempting lookup in default manager", name);
                 factory = defaultManager.getFactory(credential);
             }
         }