You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/05/29 22:24:15 UTC
svn commit: r1343960 - in
/rave/branches/model_interfaces/rave-components/rave-commons/src:
main/java/org/apache/rave/util/CollectionUtils.java
test/java/org/apache/rave/util/CollectionUtilsTest.java
Author: mfranklin
Date: Tue May 29 20:24:14 2012
New Revision: 1343960
URL: http://svn.apache.org/viewvc?rev=1343960&view=rev
Log:
Handling null collections (Supports RAVE-630)
Modified:
rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
rave/branches/model_interfaces/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java?rev=1343960&r1=1343959&r2=1343960&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java Tue May 29 20:24:14 2012
@@ -110,12 +110,15 @@ public class CollectionUtils {
* Converts the wildcard list to a typed list
* @param initial the wildcard list
* @param <T> the type constraint for the target list
- * @return the new, type constrained list
+ * @return if initial is null, null otherwise the new, type constrained list
*/
public static <T> List<T> toBaseTypedList(List<? extends T> initial) {
- List<T> list = new ArrayList<T>();
- for(T f : initial) {
- list.add(f);
+ List<T> list = null;
+ if (initial != null) {
+ list = new ArrayList<T>();
+ for (T f : initial) {
+ list.add(f);
+ }
}
return list;
}
Modified: rave/branches/model_interfaces/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java?rev=1343960&r1=1343959&r2=1343960&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java Tue May 29 20:24:14 2012
@@ -191,6 +191,14 @@ public class CollectionUtilsTest {
}
@Test
+ public void toBaseTypedList_null() {
+ List<SubTestObject> list = null;
+
+ List<TestObject> down = CollectionUtils.toBaseTypedList((List<? extends TestObject>)list);
+ assertThat(down, is(nullValue()));
+ }
+
+ @Test
public void addUniqueValues() {
List<TestObject> source = new ArrayList<TestObject>();
TestObject testObject1 = new TestObject("a", "b");