[jbosscache-commits] JBoss Cache SVN: r6411 - in core/branches/2.2.X/src/main/java/org/jboss/cache: invocation and 1 other directory.
Author: manik.surtani(a)jboss.com
Date: 2008-07-25 05:31:54 -0400 (Fri, 25 Jul 2008)
New Revision: 6411
Modified:
core/branches/2.2.X/src/main/java/org/jboss/cache/UnversionedNode.java
core/branches/2.2.X/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
Log:
Reverted to using jdk collections since these get serialized
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-25
09:20:39 UTC (rev 6410)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-25
09:31:54 UTC (rev 6411)
@@ -16,7 +16,6 @@
import org.jboss.cache.marshall.MarshalledValue;
import org.jboss.cache.optimistic.DataVersion;
import org.jboss.cache.transaction.GlobalTransaction;
-import org.jboss.cache.util.ImmutableSetCopy;
import java.util.Collection;
import java.util.Collections;
@@ -493,7 +492,7 @@
{
return Collections.emptySet();
}
- return new ImmutableSetCopy(data.keySet());
+ return Collections.unmodifiableSet(new HashSet(data.keySet()));
}
public boolean removeChildDirect(Object childName)
@@ -646,7 +645,7 @@
{
if (children != null && !children.isEmpty())
{
- return new ImmutableSetCopy<NodeSPI>((Collection) children.values());
+ return Collections.unmodifiableSet(new HashSet<NodeSPI>((Collection)
children.values()));
}
else
{
Modified:
core/branches/2.2.X/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
---
core/branches/2.2.X/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-25
09:20:39 UTC (rev 6410)
+++
core/branches/2.2.X/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-07-25
09:31:54 UTC (rev 6411)
@@ -39,12 +39,12 @@
import org.jboss.cache.statetransfer.StateTransferManager;
import org.jboss.cache.transaction.GlobalTransaction;
import org.jboss.cache.transaction.TransactionTable;
-import org.jboss.cache.util.ImmutableSetCopy;
import org.jgroups.Address;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -560,7 +560,7 @@
GetChildrenNamesCommand command =
commandsFactory.buildGetChildrenNamesCommand(fqn);
Set<E> retval = (Set<E>) invoker.invoke(ctx, command);
if (retval != null)
- retval = new ImmutableSetCopy<E>(retval);
+ retval = Collections.unmodifiableSet(new HashSet<E>(retval));
else
retval = Collections.emptySet();
return retval;