[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetad...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct  3 20:31:56 2014
New Revision: 4098

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4098&view=rev
Log:
Fix return of null from a @Nonnull method.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java?rev=4098&r1=4097&r2=4098&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java Fri Oct  3 20:31:56 2014
@@ -325,7 +325,7 @@
 
         if (Strings.isNullOrEmpty(entityID)) {
             log.debug("EntityDescriptor entityID was null or empty, skipping search for it");
-            return null;
+            return Collections.emptyList();
         }
 
         List<EntityDescriptor> descriptors = lookupIndexedEntityID(entityID);