[jbosscache-commits] JBoss Cache SVN: r5836 - in core/trunk/src: main/java/org/jboss/cache/buddyreplication and 11 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue May 13 21:36:56 EDT 2008
Author: genman
Date: 2008-05-13 21:36:56 -0400 (Tue, 13 May 2008)
New Revision: 5836
Modified:
core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/StringFqn.java
core/trunk/src/main/java/org/jboss/cache/VersionedNode.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java
core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java
core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java
core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java
core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java
core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderConfig.java
core/trunk/src/main/java/org/jboss/cache/loader/s3/S3LoaderConfig.java
core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java
core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
core/trunk/src/test/java/org/jboss/cache/eviction/DummyEvictionConfiguration.java
core/trunk/src/test/java/org/jboss/cache/options/TestVersion.java
Log:
Miscellaneous fixes pointed out by "findbugs"
Most to do with serialization
Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -261,9 +261,9 @@
channel = new JChannel(configuration.getClusterConfig());
}
}
- catch (ChannelException el)
+ catch (ChannelException e)
{
- el.printStackTrace();
+ throw new CacheException(e);
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/StringFqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -19,7 +19,7 @@
*/
// TODO: 3.0.0: Implement proper String escaping.
@Experimental
-public class StringFqn extends Fqn
+public final class StringFqn extends Fqn
{
// Needs to be public because of NodeData serialization.
// TODO: Remove in 3.0.0 once we refactor NodeData to go through a cache marshaller instead of it's current serialization.
Modified: core/trunk/src/main/java/org/jboss/cache/VersionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -41,7 +41,7 @@
super(fqn.getLastElement(), fqn, data, false, cache);
if (parent == null && !fqn.isRoot()) throw new NullPointerException("parent");
this.parent = parent;
- if (this.version == null) this.version = DefaultDataVersion.ZERO;
+ this.version = DefaultDataVersion.ZERO;
log = LogFactory.getLog(VersionedNode.class);
}
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -504,7 +504,15 @@
}
if (log.isInfoEnabled()) log.info("Removing self from buddy group " + groupName);
- buddyGroupsIParticipateIn.remove(groupName);
+
+ for (Map.Entry<Address, String> me : buddyPool.entrySet())
+ {
+ if (me.getValue().equals(groupName))
+ {
+ buddyGroupsIParticipateIn.remove(me.getKey());
+ break;
+ }
+ }
// remove backup data for this group
if (log.isInfoEnabled()) log.info("Removing backup data for group " + groupName);
Modified: core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -184,7 +184,7 @@
private Properties properties;
private SingletonStoreConfig singletonStoreConfig;
- private CacheLoader cacheLoader;
+ private transient CacheLoader cacheLoader;
protected void populateFromBaseConfig(IndividualCacheLoaderConfig base)
{
Modified: core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -35,7 +35,7 @@
protected transient Log log = LogFactory.getLog(getClass());
private transient CacheSPI cache; // back-reference to test whether the cache is running.
private final Set<ConfigurationComponent> children = Collections.synchronizedSet(new HashSet<ConfigurationComponent>());
- private ComponentRegistry cr;
+ private transient ComponentRegistry cr;
// a workaround to get over immutability checks
private boolean accessible;
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -351,6 +351,8 @@
@Override
public boolean equals(Object o)
{
+ if (!(o instanceof EvictionListEntry))
+ return false;
EvictionListEntry entry = (EvictionListEntry) o;
return this.node.getFqn().equals(entry.node.getFqn());
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/factories/BootstrapFactory.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -17,25 +17,23 @@
public class BootstrapFactory extends ComponentFactory
{
CacheSPI cacheSPI;
- Configuration configuration;
- ComponentRegistry componentRegistry;
public BootstrapFactory(CacheSPI cacheSPI, Configuration configuration, ComponentRegistry componentRegistry)
{
+ super(componentRegistry, configuration);
this.cacheSPI = cacheSPI;
- this.configuration = configuration;
- this.componentRegistry = componentRegistry;
}
- @SuppressWarnings("unchecked")
+ @Override
protected <T> T construct(Class<T> componentType)
{
- if (componentType.equals(CacheSPI.class)) return (T) cacheSPI;
+ if (componentType.isAssignableFrom(CacheSPI.class) ||
+ componentType.isAssignableFrom(Configuration.class) ||
+ componentType.isAssignableFrom(ComponentRegistry.class))
+ {
+ return componentType.cast(cacheSPI);
+ }
- if (componentType.equals(Configuration.class)) return (T) configuration;
-
- if (componentType.equals(ComponentRegistry.class)) return (T) componentRegistry;
-
throw new CacheException("Don't know how to handle type " + componentType);
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentFactory.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -25,6 +25,22 @@
protected ComponentRegistry componentRegistry;
protected Configuration configuration;
+ /**
+ * Constructs a new ComponentFactory.
+ */
+ public ComponentFactory(ComponentRegistry componentRegistry, Configuration configuration)
+ {
+ this.componentRegistry = componentRegistry;
+ this.configuration = configuration;
+ }
+
+ /**
+ * Constructs a new ComponentFactory.
+ */
+ public ComponentFactory()
+ {
+ }
+
@Inject
private void injectDependencies(Configuration configuration, ComponentRegistry componentRegistry)
{
@@ -49,4 +65,5 @@
}
if (!canConstruct) throw new ConfigurationException("Don't know how to construct " + requestedType);
}
+
}
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -321,16 +321,12 @@
{
// hasn't yet been created. Create and put in registry
cf = instantiateFactory(cfClass);
- if (cf != null)
- {
- // we simply register this factory. Registration will take care of constructing any dependencies.
- registerComponent(cf, cfClass);
- }
+ if (cf == null)
+ throw new ConfigurationException("Unable to locate component factory for component " + componentClass);
+ // we simply register this factory. Registration will take care of constructing any dependencies.
+ registerComponent(cf, cfClass);
}
- if (cf == null)
- throw new ConfigurationException("Unable to locate component factory for component " + componentClass);
-
// ensure the component factory is in the STARTED state!
Component c = componentLookup.get(cfClass.getName());
if (c.instance != cf)
@@ -921,7 +917,7 @@
/**
* Wrapper to encapsulate a method along with a priority
*/
- class PrioritizedMethod implements Comparable<PrioritizedMethod>
+ static class PrioritizedMethod implements Comparable<PrioritizedMethod>
{
Method method;
Component component;
@@ -937,7 +933,7 @@
ReflectionUtil.invokeAccessibly(component.instance, method, null);
}
-
+ @Override
public String toString()
{
return "PrioritizedMethod{" +
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/Interceptor.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -42,7 +42,6 @@
public abstract class Interceptor extends CommandInterceptor
{
protected CacheSPI<?, ?> cache;
- protected Log log = null;
protected boolean trace;
public void setCache(CacheSPI cache)
Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -263,7 +263,7 @@
}
}
- public class InvalidationFilterVisitor extends AbstractVisitor
+ public static class InvalidationFilterVisitor extends AbstractVisitor
{
Set<Fqn> result;
public boolean containsPutForExternalRead;
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -498,6 +498,6 @@
@Override
public String toString()
{
- return node == null ? null : node.toString();
+ return node == null ? "null" : node.toString();
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -79,8 +79,8 @@
*/
public static final Pattern FQN_PATTERN = Pattern.compile("[\\\\\\/:*<>|\"?]");
private static boolean isOldWindows;
-
- public FileCacheLoader()
+
+ static
{
float osVersion = -1;
try
@@ -95,6 +95,10 @@
isOldWindows = System.getProperty("os.name").toLowerCase().startsWith("windows") && osVersion < 4;
}
+ public FileCacheLoader()
+ {
+ }
+
public void setConfig(IndividualCacheLoaderConfig base)
{
if (base instanceof FileCacheLoaderConfig)
@@ -331,14 +335,16 @@
/* ----------------------- Private methods ------------------------ */
- File getDirectory(Fqn fqn, boolean create)
+ File getDirectory(Fqn fqn, boolean create) throws IOException
{
File f = new File(getFullPath(fqn));
if (!f.exists())
{
if (create)
{
- f.mkdirs();
+ boolean make = f.mkdirs();
+ if (!make)
+ throw new IOException("Unable to mkdirs " + f);
}
else
{
Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -76,7 +76,7 @@
@Override
public AdjListJDBCCacheLoaderConfig processConfig(IndividualCacheLoaderConfig base)
{
- if (config instanceof JDBCCacheLoaderOldConfig)
+ if (base instanceof JDBCCacheLoaderOldConfig)
{
config = (JDBCCacheLoaderOldConfig) base;
}
Modified: core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderConfig.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderConfig.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -9,7 +9,7 @@
{
private static final long serialVersionUID = 4626734068542420865L;
- private Cache delegate;
+ private transient Cache delegate;
public LocalDelegatingCacheLoaderConfig()
{
Modified: core/trunk/src/main/java/org/jboss/cache/loader/s3/S3LoaderConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/s3/S3LoaderConfig.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/loader/s3/S3LoaderConfig.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -30,9 +30,9 @@
private int port;
- private Bucket bucket = new Bucket("jboss-cache");
+ private transient Bucket bucket = new Bucket("jboss-cache");
- private CallingFormat callingFormat = CallingFormat.SUBDOMAIN;
+ private transient CallingFormat callingFormat = CallingFormat.SUBDOMAIN;
private String location = Connection.LOCATION_DEFAULT;
Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -129,7 +129,7 @@
else
{
if (trace)
- log.trace("failed to find or create child " + childName + " of node " + currentNode);
+ log.trace("failed to find or create child " + childName + " of node " + parent);
return false;
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/MarshalledValue.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -138,7 +138,7 @@
int size = in.readInt();
raw = new byte[size];
cachedHashCode = 0;
- in.read(raw);
+ in.readFully(raw);
cachedHashCode = in.readInt();
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/DummyEvictionConfiguration.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/DummyEvictionConfiguration.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/DummyEvictionConfiguration.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -14,7 +14,7 @@
* @author Daniel Huang (dhuang at jboss.org)
* @version $Revision$
*/
-public class DummyEvictionConfiguration implements EvictionPolicyConfig
+public class DummyEvictionConfiguration implements EvictionPolicyConfig, Cloneable
{
public String getEvictionPolicyClass()
{
Modified: core/trunk/src/test/java/org/jboss/cache/options/TestVersion.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/TestVersion.java 2008-05-13 22:04:27 UTC (rev 5835)
+++ core/trunk/src/test/java/org/jboss/cache/options/TestVersion.java 2008-05-14 01:36:56 UTC (rev 5836)
@@ -38,12 +38,13 @@
}
}
-
+ @Override
public String toString()
{
return "TestVersion-" + myVersion;
}
+ @Override
public boolean equals(Object other)
{
if (other instanceof TestVersion)
@@ -54,4 +55,11 @@
}
return false;
}
+
+ @Override
+ public int hashCode()
+ {
+ return myVersion.hashCode();
+ }
+
}
\ No newline at end of file
More information about the jbosscache-commits
mailing list