[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErr...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  9 21:41:47 2014
New Revision: 3926

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3926&view=rev
Log:
Allow for a null property.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java?rev=3926&r1=3925&r2=3926&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/logic/DefaultLocalErrorPredicate.java Mon Jun  9 21:41:47 2014
@@ -127,13 +127,15 @@
      * @param events locally handled events
      */
     public void setLocalEvents(@Nonnull @NonnullElements Collection<String> events) {
-        Constraint.isNotNull(events, "Event collection cannot be null");
-        
-        localEvents = Sets.newHashSetWithExpectedSize(events.size());
-        for (final String e : events) {
-            final String trimmed = StringSupport.trimOrNull(e);
-            if (trimmed != null) {
-                localEvents.add(trimmed);
+        if (events == null) {
+            localEvents = Collections.emptySet();
+        } else {
+            localEvents = Sets.newHashSetWithExpectedSize(events.size());
+            for (final String e : events) {
+                final String trimmed = StringSupport.trimOrNull(e);
+                if (trimmed != null) {
+                    localEvents.add(trimmed);
+                }
             }
         }
     }