svn commit: r612956 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/util/ObjectHelper.java test/java/org/apache/camel/util/ObjectHelperTest.java

[hadrian]

Author: hadrian
Date: Thu Jan 17 12:02:53 2008
New Revision: 612956

URL: http://svn.apache.org/viewvc?rev=612956&view=rev
Log:
CAMEL-290.  Patch applied with thanks!

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=612956&r1=612955&r2=612956&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
 Thu Jan 17 12:02:53 2008
@@ -167,7 +167,7 @@
             Collection collection = (Collection)collectionOrArray;
             return collection.contains(value);
         } else {
-            Iterator iter = ObjectConverter.iterator(value);
+            Iterator iter = ObjectConverter.iterator(collectionOrArray);
             while (iter.hasNext()) {
                 if (equal(value, iter.next())) {
                     return true;

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java?rev=612956&r1=612955&r2=612956&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
 Thu Jan 17 12:02:53 2008
@@ -19,6 +19,8 @@
 import junit.framework.TestCase;
 
 import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
 
 /**
  * @version $Revision$
@@ -38,6 +40,19 @@
         assertEquals("Property name", "cheese", name);
     }
 
+    public void testContains() throws Exception {
+        String[] array = {"foo", "bar"};
+        Collection<String> collection = Arrays.asList(array);
+        
+        assertTrue(ObjectHelper.contains(array, "foo"));
+        assertTrue(ObjectHelper.contains(collection, "foo"));
+        assertTrue(ObjectHelper.contains("foo", "foo"));
+        
+        assertFalse(ObjectHelper.contains(array, "xyz"));
+        assertFalse(ObjectHelper.contains(collection, "xyz"));
+        assertFalse(ObjectHelper.contains("foo", "xyz"));
+    }
+    
     public void setCheese(String cheese) {
     }
 }