[java-opensaml COMMIT] /trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Aug 29 15:09:14 2011
New Revision: 2884

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2884&view=rev
Log:
Allow set to take any number of Criterion during construction

Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java?rev=2884&r1=2883&r2=2884&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/criteria/CriteriaSet.java Mon Aug 29 15:09:14 2011
@@ -19,28 +19,31 @@
 
 import org.opensaml.util.collections.ClassIndexedSet;
 
-/**
- * This class holds instances of {@link Criterion} which are used 
- * in resolution or evaluation operations.
- */
+/** This class holds instances of {@link Criterion} which are used in resolution or evaluation operations. */
 public class CriteriaSet extends ClassIndexedSet<Criterion> {
-    
-    /**
-     * Constructor.
-     *
-     */
+
+    /** Constructor. */
     public CriteriaSet() {
         super();
     }
-    
+
     /**
-     * A convenience constructor for constructing and adding a single criteria.
-     *
-     * @param criteria a single criteria 
+     * A convenience constructor for constructing and adding criteria.
+     * 
+     * @param criteria criteria to add, may be null or contain null values
      */
-    public CriteriaSet(Criterion criteria) {
+    public CriteriaSet(Criterion... criteria) {
         super();
-        add(criteria);
+
+        if (criteria == null || criteria.length == 0) {
+            return;
+        }
+
+        for (Criterion criterion : criteria) {
+            if (criterion == null) {
+                continue;
+            }
+            add(criterion);
+        }
     }
-
-}
+}