You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/09/14 18:32:18 UTC
svn commit: r996977 -
/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java
Author: matzew
Date: Tue Sep 14 16:32:18 2010
New Revision: 996977
URL: http://svn.apache.org/viewvc?rev=996977&view=rev
Log:
TRINIDAD-1915 - CheckedSerializationMap check if delegate is Serializable
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java?rev=996977&r1=996976&r2=996977&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/CollectionUtils.java Tue Sep 14 16:32:18 2010
@@ -24,11 +24,8 @@ import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.lang.reflect.Array;
-
import java.util.AbstractQueue;
-import java.util.AbstractSet;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.ConcurrentModificationException;
@@ -43,11 +40,9 @@ import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.RandomAccess;
import java.util.Set;
-
import java.util.concurrent.atomic.AtomicReference;
import org.apache.myfaces.trinidad.component.CompositeIterator;
-import org.apache.myfaces.trinidad.context.Version;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
/**
@@ -1664,7 +1659,7 @@ public final class CollectionUtils
/**
* @param requireSerializable if <code>true</code>, require that all values in the map implement
* Serializable.
- * @param delegate
+ * @param delegate we do not check whether the delegate itself is Serializable. We just check its contents.
*/
public CheckedSerializationMap(
Map<K, V> delegate,
@@ -1672,10 +1667,7 @@ public final class CollectionUtils
{
if (delegate == null)
throw new NullPointerException();
-
- if (!(delegate instanceof Serializable))
- throw new IllegalArgumentException("Unserializable delegate");
-
+
_delegate = delegate;
_requireSerializable = requireSerializable;
}