[jbosscache-commits] JBoss Cache SVN: r6809 - in core/trunk/src: main/java/org/jboss/cache/commands/write and 4 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Sep 26 18:43:29 EDT 2008
Author: genman
Date: 2008-09-26 18:43:28 -0400 (Fri, 26 Sep 2008)
New Revision: 6809
Modified:
core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/config/EvictionRegionConfig.java
core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java
Log:
Code clean-up
Modified: core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/DataContainerImpl.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -144,7 +144,7 @@
*/
public void setRoot(Object root)
{
- if (root == null) throw new CacheException("Attempting to set an invalid node [" + root + "] as a root node!");
+ if (root == null) throw new CacheException("Attempting to set a null node as a root node!");
// Mega-Ugh!
if (usingMvcc && root instanceof InternalNode)
{
Modified: core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -56,7 +56,6 @@
protected LockStrategyFactory lockStrategyFactory;
CommandsFactory commandsFactory;
protected NodeFactory<K, V> nodeFactory;
- protected CacheSPI<K, V> cache;
public PessimisticUnversionedNode(Object name, Fqn fqn, Map<K, V> data, CacheSPI<K, V> cache)
{
Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -111,7 +111,7 @@
public void start()
{
if (trace) log.trace("Starting region manager");
- isUsingBR = configuration != null && configuration.getBuddyReplicationConfig() != null && configuration.getBuddyReplicationConfig().isEnabled();
+ isUsingBR = configuration.getBuddyReplicationConfig() != null && configuration.getBuddyReplicationConfig().isEnabled();
evictionConfig = configuration.getEvictionConfig();
if (evictionConfig != null && evictionConfig.isValidConfig())
{
Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -102,13 +102,9 @@
else if (recursive)
{
Collection<Fqn> nodesToEvict = getRecursiveEvictionNodes();
-
- if (nodesToEvict != null)
+ for (Fqn aFqn : nodesToEvict)
{
- for (Fqn aFqn : nodesToEvict)
- {
- evictNode(aFqn, ctx, lookupForEviction(ctx, aFqn));
- }
+ evictNode(aFqn, ctx, lookupForEviction(ctx, aFqn));
}
return !nodesToEvict.isEmpty();
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -47,7 +47,7 @@
private Marshaller marshaller;
- private JGroupsStackParser jGroupsStackParser = new JGroupsStackParser();
+ private transient JGroupsStackParser jGroupsStackParser = new JGroupsStackParser();
private boolean invocationBatchingEnabled;
/**
Modified: core/trunk/src/main/java/org/jboss/cache/config/EvictionRegionConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/EvictionRegionConfig.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/config/EvictionRegionConfig.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -213,11 +213,6 @@
EvictionRegionConfig clone = (EvictionRegionConfig) super.clone();
if (evictionAlgorithmConfig != null)
{
- if (!(evictionAlgorithmConfig instanceof Cloneable))
- {
- throw new CloneNotSupportedException(evictionAlgorithmConfig + " is not Cloneable");
- }
-
if (evictionAlgorithmConfig instanceof ConfigurationComponent)
{
clone.setEvictionAlgorithmConfig((EvictionAlgorithmConfig) ((ConfigurationComponent) evictionAlgorithmConfig).clone());
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -98,7 +98,7 @@
{
this.txTable = txTable;
this.clm = clm;
- CacheMode mode = configuration.getCacheMode();
+// CacheMode mode = configuration.getCacheMode();
// usingVersionedInvalidation = mode.isInvalidation();
this.dataContainer = dataContainer;
this.notifier = notifier;
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -362,7 +362,7 @@
*/
private void addToModificationList(WriteCommand command, InvocationContext ctx)
{
- Option opt = ctx.getOptionOverrides();
+ // Option opt = ctx.getOptionOverrides();
ctx.getTransactionContext().addModification(command);
if (log.isDebugEnabled()) log.debug("Adding command " + command + " to modification list");
}
Modified: core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/main/java/org/jboss/cache/util/ImmutableListCopy.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -55,6 +55,12 @@
private static final long serialVersionUID = 10929568968966L;
private E[] elements;
private int size;
+
+ /**
+ * Constructs a new ImmutableListCopy.
+ * Required by Serialization.
+ */
+ public ImmutableListCopy() {}
/**
* Only one copy constructor since the list is immutable.
Modified: core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java 2008-09-26 22:07:59 UTC (rev 6808)
+++ core/trunk/src/test/java/org/jboss/cache/util/ImmutableListCopyTest.java 2008-09-26 22:43:28 UTC (rev 6809)
@@ -1,12 +1,16 @@
package org.jboss.cache.util;
-import org.testng.annotations.Test;
-
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.ListIterator;
+import org.testng.annotations.Test;
+
@Test(groups = "unit")
public class ImmutableListCopyTest
{
@@ -149,4 +153,16 @@
assert ints.subList(1, 9).equals(list.subList(1, 9));
assert ints.subList(0, 1).equals(list.subList(0, 1));
}
+
+ static Object copy(Object o) throws Exception {
+ ByteArrayOutputStream bo = new ByteArrayOutputStream();
+ new ObjectOutputStream(bo).writeObject(o);
+ ByteArrayInputStream is = new ByteArrayInputStream(bo.toByteArray());
+ return new ObjectInputStream(is).readObject();
+ }
+
+ public void testSerialization() throws Exception {
+ List<Integer> ints = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+ copy( Immutables.immutableListCopy(ints) );
+ }
}
More information about the jbosscache-commits
mailing list