[jbosscache-commits] JBoss Cache SVN: r5665 - in core/trunk/src/main/java/org/jboss/cache: buddyreplication and 21 other directories.

Author: manik.surtani(a)jboss.com Date: 2008-04-24 10:45:57 -0400 (Thu, 24 Apr 2008) New Revision: 5665 Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java core/trunk/src/main/java/org/jboss/cache/RegionImpl.java core/trunk/src/main/java/org/jboss/cache/RegionManager.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java Log: IntelliJ inspections Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -21,7 +21,7 @@ /** * Flags placed on the node. Replaces older 'boolean' flags. */ - protected EnumSet<NodeFlags> flags = EnumSet.noneOf(NodeFlags.class); + protected final EnumSet<NodeFlags> flags = EnumSet.noneOf(NodeFlags.class); /** * These flags were originally stored as booleans on the UnversionedNode class. They have been replaced with an enum Modified: core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,9 +39,9 @@ private boolean configRegistryInjected; - private Map<String, Cache<Object, Object>> caches = new HashMap<String, Cache<Object, Object>>(); + private final Map<String, Cache<Object, Object>> caches = new HashMap<String, Cache<Object, Object>>(); - private Map<String, Integer> checkouts = new HashMap<String, Integer>(); + private final Map<String, Integer> checkouts = new HashMap<String, Integer>(); private ChannelFactory channelFactory; @@ -127,19 +127,19 @@ return cache; } - + /** * Extension point for subclasses, where we actually use a * {@link CacheFactory} to create a cache. This default implementation * uses {@link DefaultCacheFactory}. - * + * * @param config the Configuration for the cache * @return the Cache */ @SuppressWarnings("unchecked") protected Cache<Object, Object> createCache(Configuration config) { - return new DefaultCacheFactory().createCache(config, false); + return new DefaultCacheFactory().createCache(config, false); } public void releaseCache(String configName) Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -61,8 +61,8 @@ public class RPCManagerImpl implements RPCManager { private Channel channel; - private Log log = LogFactory.getLog(RPCManagerImpl.class); - private List<Address> members = new LinkedList<Address>(); + private final Log log = LogFactory.getLog(RPCManagerImpl.class); + private final List<Address> members = new LinkedList<Address>(); /** * True if this Cache is the coordinator. */ @@ -84,7 +84,7 @@ private Notifier notifier; private CacheSPI spi; private InvocationContextContainer invocationContextContainer; - private boolean trace = log.isTraceEnabled(); + private final boolean trace = log.isTraceEnabled(); private Marshaller marshaller; private TransactionManager txManager; private TransactionTable txTable; Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -29,8 +29,8 @@ { private static final Log log = LogFactory.getLog(RegionImpl.class); - private RegionManager regionManager; - private Fqn fqn; + private final RegionManager regionManager; + private final Fqn fqn; private Status status; private ClassLoader classLoader; private BlockingQueue<EvictedEventNode> nodeEventQueue = null; @@ -61,7 +61,7 @@ public Configuration getCacheConfiguration() { - if (regionManager!= null && regionManager.getCache() != null) + if (regionManager != null && regionManager.getCache() != null) return regionManager.getCache().getConfiguration(); else return null; @@ -143,12 +143,12 @@ public String toString() { return "RegionImpl{" + - "fqn=" + fqn + - "; classloader="+ classLoader + - "; status=" + status + - "; eviction=" + (getEvictionPolicy() != null) + - "; timerThreadRegistered=" + (getEvictionPolicy() != null && regionManager.getEvictionTimerTask().isRegionRegisteredForProcessing(this)) + - '}'; + "fqn=" + fqn + + "; classloader=" + classLoader + + "; status=" + status + + "; eviction=" + (getEvictionPolicy() != null) + + "; timerThreadRegistered=" + (getEvictionPolicy() != null && regionManager.getEvictionTimerTask().isRegionRegisteredForProcessing(this)) + + '}'; } public int compareTo(Region other) @@ -164,8 +164,8 @@ if (nodeEventQueue.size() > capacityWarnThreshold) { log.warn("putNodeEvent(): eviction node event queue size is at 98% threshold value of capacity: " + configuration.getEventQueueSize() + - " Region: " + fqn + - " You will need to reduce the wakeUpIntervalSeconds parameter."); + " Region: " + fqn + + " You will need to reduce the wakeUpIntervalSeconds parameter."); } nodeEventQueue.put(event); } Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -47,13 +47,13 @@ /** * A registry of regions that have been defined. */ - private Map<Fqn, Region> regionsRegistry = new ConcurrentHashMap<Fqn, Region>(); + private final Map<Fqn, Region> regionsRegistry = new ConcurrentHashMap<Fqn, Region>(); private boolean defaultInactive; - private Log log = LogFactory.getLog(RegionManager.class); + private final Log log = LogFactory.getLog(RegionManager.class); private CacheSPI cache; private boolean usingEvictions; private EvictionConfig evictionConfig; - private EvictionTimerTask evictionTimerTask = new EvictionTimerTask(); + private final EvictionTimerTask evictionTimerTask = new EvictionTimerTask(); protected final Set<Fqn> activationChangeNodes = Collections.synchronizedSet(new HashSet<Fqn>()); protected Configuration configuration; Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -41,7 +41,7 @@ * Debug log. */ protected static Log log = LogFactory.getLog(UnversionedNode.class); - protected static boolean trace = log.isTraceEnabled(); + protected static final boolean trace = log.isTraceEnabled(); /** * Lock manager that manages locks to be acquired when accessing the node inside a transaction. Lazy set just in case Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -41,7 +41,7 @@ public static final Fqn<String> BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString(BUDDY_BACKUP_SUBTREE); - private String buddyGroupName; + private final String buddyGroupName; CommandsFactory factory; Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,7 +39,7 @@ /** * List<Address> - a list of JGroups addresses */ - private List<Address> buddies = new CopyOnWriteArrayList<Address>(); + private final List<Address> buddies = new CopyOnWriteArrayList<Address>(); public String getGroupName() { Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -58,7 +58,7 @@ */ public class BuddyManager { - private Log log = LogFactory.getLog(BuddyManager.class); + private final Log log = LogFactory.getLog(BuddyManager.class); private boolean trace; BuddyReplicationConfig config; @@ -98,7 +98,7 @@ * Keyed on String group name, values are BuddyGroup objects. * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp */ - Map<Address, BuddyGroup> buddyGroupsIParticipateIn = new ConcurrentHashMap<Address, BuddyGroup>(); + final Map<Address, BuddyGroup> buddyGroupsIParticipateIn = new ConcurrentHashMap<Address, BuddyGroup>(); /** * Queue to deal with queued up view change requests - which are handled asynchronously @@ -108,7 +108,7 @@ /** * Async thread that handles items on the view change queue */ - private AsyncViewChangeHandlerThread asyncViewChangeHandler = new AsyncViewChangeHandlerThread(); + private final AsyncViewChangeHandlerThread asyncViewChangeHandler = new AsyncViewChangeHandlerThread(); /** * Constants representng the buddy backup subtree @@ -130,7 +130,7 @@ */ private final Object poolInfoNotifierLock = new Object(); - private CountDownLatch initialisationLatch = new CountDownLatch(1); + private final CountDownLatch initialisationLatch = new CountDownLatch(1); // a dummy MembershipChange - a poison-pill to be placed on the membership change queue to notify async handler // threads to exit gracefully when the BuddyManager has been stopped. private static final MembershipChange STOP_NOTIFIER = new MembershipChange(null, null); @@ -317,8 +317,8 @@ static class MembershipChange { - List<Address> oldMembers; - List<Address> newMembers; + final List<Address> oldMembers; + final List<Address> newMembers; public MembershipChange(List<Address> oldMembers, List<Address> newMembers) { @@ -687,7 +687,7 @@ { try { - makeRemoteCall(buddies, command, true); + makeRemoteCall(buddies, command); break; } catch (Exception e) @@ -782,7 +782,7 @@ { try { - makeRemoteCall(buddies, membershipCall, true); + makeRemoteCall(buddies, membershipCall); break; } catch (Exception e) @@ -838,7 +838,7 @@ try { - byte[] state = generateState(fqn, timeouts[i], force, false); + byte[] state = generateState(fqn, timeouts[i], force); if (log.isDebugEnabled()) { log.debug("acquireState(): got state"); @@ -885,20 +885,19 @@ * State returned is a serialized byte[][], element 0 is the transient state * (or null), and element 1 is the persistent state (or null). * - * @param fqn Fqn indicating the uppermost node in the - * portion of the cache whose state should be returned. - * @param timeout max number of ms this method should wait to acquire - * a read lock on the nodes being transferred - * @param force if a read lock cannot be acquired after - * <code>timeout</code> ms, should the lock acquisition - * be forced, and any existing transactions holding locks - * on the nodes be rolled back? <strong>NOTE:</strong> - * In release 1.2.4, this parameter has no effect. - * @param suppressErrors should any Throwable thrown be suppressed? + * @param fqn Fqn indicating the uppermost node in the + * portion of the cache whose state should be returned. + * @param timeout max number of ms this method should wait to acquire + * a read lock on the nodes being transferred + * @param force if a read lock cannot be acquired after + * <code>timeout</code> ms, should the lock acquisition + * be forced, and any existing transactions holding locks + * on the nodes be rolled back? <strong>NOTE:</strong> + * In release 1.2.4, this parameter has no effect. * @return a serialized byte[][], element 0 is the transient state * (or null), and element 1 is the persistent state (or null). */ - public byte[] generateState(Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable + private byte[] generateState(Fqn fqn, long timeout, boolean force) throws Throwable { MarshalledValueOutputStream out = null; @@ -907,7 +906,7 @@ { ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024); out = new MarshalledValueOutputStream(baos); - stateTransferManager.getState(out, fqn, timeout, force, suppressErrors); + stateTransferManager.getState(out, fqn, timeout, force, false); result = baos.getRawBuffer(); } finally @@ -938,7 +937,7 @@ try { - makeRemoteCall(recipients, command, true); + makeRemoteCall(recipients, command); } catch (Exception e) { @@ -946,7 +945,7 @@ } } - private void makeRemoteCall(List<Address> recipients, CacheCommand call, boolean sync) throws Exception + private void makeRemoteCall(List<Address> recipients, CacheCommand call) throws Exception { // remove non-members from dest list if (recipients != null) @@ -963,7 +962,7 @@ } } - rpcManager.callRemoteMethods(recipients, call, sync, true, config.getBuddyCommunicationTimeout(), false); + rpcManager.callRemoteMethods(recipients, call, true, true, config.getBuddyCommunicationTimeout(), false); } Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -14,11 +14,11 @@ */ public class GravitateResult { - private boolean dataFound; + private final boolean dataFound; - private List<NodeData> nodeData; + private final List<NodeData> nodeData; - private Fqn buddyBackupFqn; + private final Fqn buddyBackupFqn; /** * Factory method that creates a GravitateResult indicating that no data has been found. @@ -76,7 +76,7 @@ public String toString() { return "Result dataFound=" + dataFound + - " nodeData=" + nodeData + - " fqn=" + buddyBackupFqn; + " nodeData=" + nodeData + + " fqn=" + buddyBackupFqn; } } Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -38,7 +38,7 @@ @ThreadSafe public class NextMemberBuddyLocator implements BuddyLocator { - private Log log = LogFactory.getLog(NextMemberBuddyLocator.class); + private final Log log = LogFactory.getLog(NextMemberBuddyLocator.class); private NextMemberBuddyLocatorConfig config = new NextMemberBuddyLocatorConfig(); @@ -121,11 +121,11 @@ Address candidate = currentMembership.get(subscript); if ( - !candidate.equals(dataOwner) && // ignore self from selection as buddy - !buddies.contains(candidate) && // havent already considered this candidate - (!ignoreColocatedBuddiesForSession || !isColocated(candidate, dataOwner)) && // ignore colocated buddies - (isInSameBuddyPool(buddyPoolMap, candidate, dataOwner))// try and find buddies in the same buddy pool first - ) + !candidate.equals(dataOwner) && // ignore self from selection as buddy + !buddies.contains(candidate) && // havent already considered this candidate + (!ignoreColocatedBuddiesForSession || !isColocated(candidate, dataOwner)) && // ignore colocated buddies + (isInSameBuddyPool(buddyPoolMap, candidate, dataOwner))// try and find buddies in the same buddy pool first + ) { buddies.add(candidate); } Modified: core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -26,7 +26,7 @@ public class ReplicationQueue { - private static Log log = LogFactory.getLog(ReplicationQueue.class); + private static final Log log = LogFactory.getLog(ReplicationQueue.class); /** * We flush every 5 seconds. Inactive if -1 or 0 Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -19,7 +19,7 @@ public class CreateNodeCommand extends BaseCacheDataCommand implements TxCacheCommand { public static final int METHOD_ID = 48; - private List<Fqn> newlyCreated = new LinkedList<Fqn>(); + private final List<Fqn> newlyCreated = new LinkedList<Fqn>(); public CreateNodeCommand() { Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -17,7 +17,7 @@ public class GetKeyValueCommand extends BaseCacheDataCommand { public static final int METHOD_ID = 26; - private static Log log = LogFactory.getLog(GetKeyValueCommand.class); + private static final Log log = LogFactory.getLog(GetKeyValueCommand.class); private static boolean trace; private Object key; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -33,7 +33,7 @@ public class InvalidateCommand extends EvictNodeCommand { public static final int METHOD_ID = 47; - private static Log log = LogFactory.getLog(InvalidateCommand.class); + private static final Log log = LogFactory.getLog(InvalidateCommand.class); private static boolean trace; /* dependencies*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -29,7 +29,7 @@ public static final int VERSIONED_METHOD_ID = 37; public static final int ERASE_VERSIONED_METHOD_ID = 38; - private static Log log = LogFactory.getLog(PutDataMapCommand.class); + private static final Log log = LogFactory.getLog(PutDataMapCommand.class); private static boolean trace; /* dependencies*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -30,7 +30,7 @@ public static final int PUT_FOR_EXT_READ_METHOD_ID = 45; public static final int PUT_FOR_EXT_READ_VERSIONED_METHOD_ID = 46; - private static Log log = LogFactory.getLog(PutKeyValueCommand.class); + private static final Log log = LogFactory.getLog(PutKeyValueCommand.class); private static boolean trace; /* parametres */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public static final int METHOD_ID = 7; public static final int VERSIONED_METHOD_ID = 42; - private static Log log = LogFactory.getLog(RemoveDataCommand.class); + private static final Log log = LogFactory.getLog(RemoveDataCommand.class); private static boolean trace; /* parameters*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public static final int METHOD_ID = 6; public static final int VERSIONED_METHOD_ID = 41; - private static Log log = LogFactory.getLog(RemoveKeyCommand.class); + private static final Log log = LogFactory.getLog(RemoveKeyCommand.class); private static boolean trace; /* parameters */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ { public static final int METHOD_ID = 5; public static final int VERSIONED_METHOD_ID = 40; - private static Log log = LogFactory.getLog(RemoveNodeCommand.class); + private static final Log log = LogFactory.getLog(RemoveNodeCommand.class); private static boolean trace; private boolean isOptimistic; Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -16,10 +16,6 @@ { public static final int METHOD_ID = 43; - public BlockChannelCommand() - { - } - public Object perform(InvocationContext ctx) throws Throwable { return null; Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -16,10 +16,6 @@ { public static final int METHOD_ID = 44; - public UnblockChannelCommand() - { - } - public Object perform(InvocationContext ctx) throws Throwable { //noop Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -28,7 +28,7 @@ private CacheData cacheData; private InterceptorChain interceptorChain; - private static Log log = LogFactory.getLog(ClusteredGetCommand.class); + private static final Log log = LogFactory.getLog(ClusteredGetCommand.class); private static boolean trace; public ClusteredGetCommand() Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,7 +39,7 @@ private InterceptorChain invoker; private CommandsFactory commandsFactory; - private static Log log = LogFactory.getLog(DataGravitationCleanupCommand.class); + private static final Log log = LogFactory.getLog(DataGravitationCleanupCommand.class); private static boolean trace; /* parameters */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -37,7 +37,7 @@ /* parametres */ private boolean searchSubtrees; - private static Log log = LogFactory.getLog(GravitateDataCommand.class); + private static final Log log = LogFactory.getLog(GravitateDataCommand.class); private static boolean trace; public GravitateDataCommand() Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -25,7 +25,7 @@ private InterceptorChain invoker; - private static Log log = LogFactory.getLog(ReplicateCommand.class); + private static final Log log = LogFactory.getLog(ReplicateCommand.class); private static boolean trace; /** Modified: core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -179,12 +179,4 @@ command.accept(ctx, this); } } - - public void visitCollectionGeneric(InvocationContext ctx, Collection toVisit) throws Throwable - { - for (Object command : toVisit) - { - ((CacheCommand) command).accept(ctx, this); - } - } } Modified: core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -7,103 +7,105 @@ package org.jboss.cache.config; +import org.jboss.cache.factories.CacheConfigsXmlParser; + import java.util.HashSet; import java.util.Hashtable; import java.util.Map; import java.util.Set; -import org.jboss.cache.factories.CacheConfigsXmlParser; - /** * {@link ConfigurationRegistry} that obtains its initial set of configurations * by parsing an XML document. - * + * * @author <a href=&quot;brian.stansberry(a)jboss.com&quot;&gt;Brian Stansberry</a> * @version $Revision: 1 $ */ -public class XmlParsingConfigurationRegistry implements ConfigurationRegistry -{ - private CacheConfigsXmlParser parser; - private String configResource; - private Map<String, Configuration> configs = new Hashtable<String, Configuration>(); - private boolean started; - - public XmlParsingConfigurationRegistry(String configResource) - { - parser = new CacheConfigsXmlParser(); - this.configResource = configResource; - } - - public void start() throws Exception - { - if (!started) - { - if (configResource != null) - configs.putAll(parser.parseConfigs(configResource)); - started = true; - } - } - - public void stop() - { - if (started) - { - synchronized (configs) - { - configs.clear(); - } - started = false; - } - } - - public String getConfigResource() - { - return configResource; - } +public class XmlParsingConfigurationRegistry implements ConfigurationRegistry +{ + private final CacheConfigsXmlParser parser; + private final String configResource; + private final Map<String, Configuration> configs = new Hashtable<String, Configuration>(); + private boolean started; - public Set<String> getConfigurationNames() - { - return new HashSet<String>(configs.keySet()); - } - - public void registerConfiguration(String configName, Configuration config) - throws CloneNotSupportedException - { - synchronized (configs) { - if (configs.containsKey(configName)) - throw new IllegalStateException(configName + " already registered"); - configs.put(configName, config.clone()); - } - } - - public void unregisterConfiguration(String configName) - { - synchronized (configs) { - if (configs.remove(configName) == null) - throw new IllegalStateException(configName + " not registered"); - } - } - - public Configuration getConfiguration(String configName) - { - Configuration config = null; - synchronized (configs) - { - config = configs.get(configName); - } - - if (config == null) - throw new IllegalArgumentException("unknown config " + configName); - - // Don't hand out a ref to our master copy - try - { - return config.clone(); - } - catch (CloneNotSupportedException e) - { - // This should not happen, as we already cloned the config - throw new RuntimeException("Could not clone configuration " + configName, e); - } - } + public XmlParsingConfigurationRegistry(String configResource) + { + parser = new CacheConfigsXmlParser(); + this.configResource = configResource; + } + + public void start() throws Exception + { + if (!started) + { + if (configResource != null) + configs.putAll(parser.parseConfigs(configResource)); + started = true; + } + } + + public void stop() + { + if (started) + { + synchronized (configs) + { + configs.clear(); + } + started = false; + } + } + + public String getConfigResource() + { + return configResource; + } + + public Set<String> getConfigurationNames() + { + return new HashSet<String>(configs.keySet()); + } + + public void registerConfiguration(String configName, Configuration config) + throws CloneNotSupportedException + { + synchronized (configs) + { + if (configs.containsKey(configName)) + throw new IllegalStateException(configName + " already registered"); + configs.put(configName, config.clone()); + } + } + + public void unregisterConfiguration(String configName) + { + synchronized (configs) + { + if (configs.remove(configName) == null) + throw new IllegalStateException(configName + " not registered"); + } + } + + public Configuration getConfiguration(String configName) + { + Configuration config = null; + synchronized (configs) + { + config = configs.get(configName); + } + + if (config == null) + throw new IllegalArgumentException("unknown config " + configName); + + // Don't hand out a ref to our master copy + try + { + return config.clone(); + } + catch (CloneNotSupportedException e) + { + // This should not happen, as we already cloned the config + throw new RuntimeException("Could not clone configuration " + configName, e); + } + } } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.cache.eviction; @@ -10,47 +10,48 @@ import org.jboss.cache.config.EvictionPolicyConfig; /** - * Eviction policy that does nothing and always tells the eviction + * Eviction policy that does nothing and always tells the eviction * interceptor an event can be ignored, saving the overhead of * constructing and processing event objects. Basically useful - * as a default policy for a cache or subtree that is - * shared between multiple usages, some of which don't + * as a default policy for a cache or subtree that is + * shared between multiple usages, some of which don't * want eviction. - * + * * @author Brian Stansberry */ public class NullEvictionPolicy implements EvictionPolicy { private static final Log log = LogFactory.getLog(NullEvictionPolicy.class); - + private CacheSPI cache; - + /** - * Constructs a new NullEvictionPolicy. + * Returns <code>true</code> */ - public NullEvictionPolicy() - { - } - - /** Returns <code>true</code> */ public boolean canIgnoreEvent(Fqn fqn, NodeEventType eventType) { return true; } - /** No-op */ + /** + * No-op + */ public void evict(Fqn fqn) throws Exception { log.debug("evict should not be called on NullEvictionPolicy"); } - /** Returns {@link NullEvictionAlgorithm#INSTANCE}. */ + /** + * Returns {@link NullEvictionAlgorithm#INSTANCE}. + */ public EvictionAlgorithm getEvictionAlgorithm() { return NullEvictionAlgorithm.INSTANCE; } - /** Returns {@link NullEvictionPolicyConfig}. */ + /** + * Returns {@link NullEvictionPolicyConfig}. + */ public Class<? extends EvictionPolicyConfig> getEvictionConfigurationClass() { return NullEvictionPolicyConfig.class; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.cache.eviction; @@ -9,24 +9,17 @@ /** * Configuration class for {@link NullEvictionPolicy}. - * + * * @author Brian Stansberry */ public class NullEvictionPolicyConfig - extends ConfigurationComponent - implements EvictionPolicyConfig + extends ConfigurationComponent + implements EvictionPolicyConfig { private static final long serialVersionUID = -6591180473728241737L; /** - * Constructs a new NullEvictionPolicyConfig. - */ - public NullEvictionPolicyConfig() - { - } - - /** * Returns {@link NullEvictionPolicy}. */ public String getEvictionPolicyClass() @@ -34,13 +27,17 @@ return NullEvictionPolicy.class.getName(); } - /** No-op */ + /** + * No-op + */ public void reset() { // no-op } - /** No-op */ + /** + * No-op + */ public void validate() throws ConfigurationException { // no-op Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -72,14 +72,14 @@ /** * The registry of components. Components are stored under their name. */ - Map<String, Component> componentLookup = new HashMap<String, Component>(); + final Map<String, Component> componentLookup = new HashMap<String, Component>(); /** * Contains class definitions of component factories that can be used to construct certain components */ Map<Class, Class<? extends ComponentFactory>> defaultFactories = null; - private static Log log = LogFactory.getLog(ComponentRegistry.class); + private static final Log log = LogFactory.getLog(ComponentRegistry.class); private Bootstrap bootstrap; // cache of reflection methods to call during injections. These will be emptied when start() is called. @@ -745,11 +745,11 @@ class Component { Object instance; - String name; - Class type; + final String name; + final Class type; State state = CONSTRUCTED; - Set<Component> dependencies = new HashSet<Component>(3); - Set<Component> dependencyFor = new HashSet<Component>(3); + final Set<Component> dependencies = new HashSet<Component>(3); + final Set<Component> dependencyFor = new HashSet<Component>(3); boolean deepRecursionDetector = false; public Component(String name, Class type) @@ -969,13 +969,13 @@ class Bootstrap { - InterceptorChain interceptorChain; - CacheLifecycleManager lifecycleManager; - CacheData cacheData; - CacheSPI cacheSPI; - ComponentRegistry componentRegistry; - Configuration configuration; - private ClassLoader deployerClassLoader; + final InterceptorChain interceptorChain; + final CacheLifecycleManager lifecycleManager; + final CacheData cacheData; + final CacheSPI cacheSPI; + final ComponentRegistry componentRegistry; + final Configuration configuration; + private final ClassLoader deployerClassLoader; Bootstrap(ClassLoader deployerClassLoader, InterceptorChain interceptorChain, CacheLifecycleManager lifecycleManager, CacheData cacheData, CacheSPI cacheSPI, ComponentRegistry componentRegistry, Configuration configuration) Modified: core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -54,7 +54,7 @@ */ public class XmlConfigurationParser { - private static Log log = LogFactory.getLog(XmlConfigurationParser.class); + private static final Log log = LogFactory.getLog(XmlConfigurationParser.class); public static final String ATTR = "attribute"; public static final String NAME = "name"; @@ -702,8 +702,8 @@ static class ParsedAttributes { - Map<String, String> stringAttribs; - Map<String, Element> xmlAttribs; + final Map<String, String> stringAttribs; + final Map<String, Element> xmlAttribs; ParsedAttributes(Map strings, Map elements) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -81,21 +81,16 @@ protected void replicateCall(InvocationContext ctx, CacheCommand call, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, null, call, sync, o, true, useOutOfBandMessage); + replicateCall(ctx, null, call, sync, o, useOutOfBandMessage); } protected void replicateCall(InvocationContext ctx, CacheCommand call, boolean sync, Option o) throws Throwable { - replicateCall(ctx, null, call, sync, o); + replicateCall(ctx, null, call, sync, o, false); } - protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand call, boolean sync, Option o) throws Throwable + protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand c, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, recipients, call, sync, o, true, false); - } - - protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand c, boolean sync, Option o, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage) throws Throwable - { long syncReplTimeout = config.getSyncReplTimeout(); // test for option overrides @@ -120,7 +115,7 @@ } } - replicateCall(recipients, c, sync, wrapCacheCommandInReplicateMethod, useOutOfBandMessage, false, (int) syncReplTimeout); + replicateCall(recipients, c, sync, true, useOutOfBandMessage, false, (int) syncReplTimeout); } protected void replicateCall(List<Address> recipients, CacheCommand c, boolean sync, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage, boolean isBroadcast, int timeout) throws Throwable Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -77,10 +77,10 @@ public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { List<Fqn> fqns = new ArrayList<Fqn>(); - fqns.add((Fqn) command.getTo()); + fqns.add(command.getTo()); // peek into Node and get a hold of all child fqns as these need to be in the workspace. NodeSPI node = cacheData.peek(command.getFqn(), true, true); - greedyGetFqns(fqns, node, (Fqn) command.getTo()); + greedyGetFqns(fqns, node, command.getTo()); if (trace) log.trace("Adding Fqns " + fqns + " for a move() operation."); for (Fqn f : fqns) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -136,7 +136,7 @@ throw new CacheException("Unable to set node version for " + command.getFqn() + ", node is null."); } } - putDataMapAndNotify(command.getData(), false, workspace, workspaceNode, ctx); + putDataMapAndNotify(command.getData(), workspace, workspaceNode, ctx); addToModificationList(gtx, command, ctx); return null; } @@ -336,7 +336,6 @@ * Adds a method call to the modification list of a given transaction's transaction entry * * @param gtx transaction - * @param m methodcall to add */ private void addToModificationList(GlobalTransaction gtx, TxCacheCommand command, InvocationContext ctx) { @@ -427,13 +426,12 @@ } } - private void putDataMapAndNotify(Map<Object, Object> data, boolean eraseExisitng, TransactionWorkspace workspace, WorkspaceNode workspaceNode, InvocationContext ctx) + private void putDataMapAndNotify(Map<Object, Object> data, TransactionWorkspace workspace, WorkspaceNode workspaceNode, InvocationContext ctx) { if (workspaceNode == null) throw new NodeNotExistsException("optimisticCreateIfNotExistsInterceptor should have created this node!"); // pre-notify notifier.notifyNodeModified(workspaceNode.getFqn(), true, PUT_MAP, workspaceNode.getData(), ctx); - if (eraseExisitng) workspaceNode.clearData(); workspaceNode.putAll(data); workspace.addNode(workspaceNode); // post-notify Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -282,7 +282,7 @@ public class DataVersionPopulator extends AbstractCommandsVisitor { - TransactionWorkspace workspace; + final TransactionWorkspace workspace; public DataVersionPopulator(TransactionWorkspace workspace) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -21,10 +21,10 @@ */ public class OrderedSynchronizationHandler implements Synchronization { - static Log log = LogFactory.getLog(OrderedSynchronizationHandler.class); + static final Log log = LogFactory.getLog(OrderedSynchronizationHandler.class); private Transaction tx = null; - private LinkedList<Synchronization> handlers = new LinkedList<Synchronization>(); + private final LinkedList<Synchronization> handlers = new LinkedList<Synchronization>(); public OrderedSynchronizationHandler(Transaction tx) throws SystemException, RollbackException { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public class PassivationInterceptor extends ChainedInterceptor implements PassivationInterceptorMBean { - private AtomicLong passivations = new AtomicLong(0); + private final AtomicLong passivations = new AtomicLong(0); protected CacheLoader loader; private Notifier notifier; Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -70,14 +70,14 @@ private InvocationContextContainer invocationContextContainer; private CacheLifecycleManager lifecycleManager; - private ModificationsReplayVisitor replayVisitorNoInject = new ModificationsReplayVisitor(false); - private ModificationsReplayVisitor replayVisitorWithInject = new ModificationsReplayVisitor(true); + private final ModificationsReplayVisitor replayVisitorNoInject = new ModificationsReplayVisitor(false); + private final ModificationsReplayVisitor replayVisitorWithInject = new ModificationsReplayVisitor(true); /** * List <Transaction>that we have registered for */ - private Map transactions = new ConcurrentHashMap(16); - private Map rollbackTransactions = new ConcurrentHashMap(16); + private final Map transactions = new ConcurrentHashMap(16); + private final Map rollbackTransactions = new ConcurrentHashMap(16); private long prepares = 0; private long commits = 0; @@ -532,7 +532,6 @@ * <p/> * Resumes any existing txs before returning. * - * @return * @throws Throwable */ private Object handleOptimisticPrepare(InvocationContext ctx, GlobalTransaction gtx, Transaction ltx, OptimisticPrepareCommand command) throws Throwable @@ -553,7 +552,7 @@ private Object handlePessimisticPrepare(InvocationContext ctx, Transaction ltx, PrepareCommand command) throws Exception { boolean success = true; - Object retval; + Object retval = null; try { // now pass up the prepare method itself. @@ -567,7 +566,7 @@ } else { - invokeNextInterceptor(ctx, command); + retval = invokeNextInterceptor(ctx, command); } // JBCACHE-361 Confirm that the transaction is ACTIVE @@ -638,12 +637,12 @@ } } } - return null; + return retval; } public class ModificationsReplayVisitor extends DataVersionCommandsVisitor { - private boolean injectDataVersions; + private final boolean injectDataVersions; public ModificationsReplayVisitor(boolean injectDataVersions) { Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -34,7 +34,7 @@ * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) * @since 2.1.0 - * todo [mmarkus] consider renaming this as it does not look as an Delegate (rather as a facade) + * todo [mmarkus] consider renaming this as it does not look as an Delegate (rather as a facade) */ @SuppressWarnings("unchecked") public class CacheInvocationDelegate<K, V> extends AbstractInvocationDelegate implements CacheSPI<K, V> @@ -53,10 +53,6 @@ private CommandsFactory commandsFactory;// tu be built here and imjected within any CacheCommand instance. Also pass this to the interceptor chain private CacheTransactionHelper transactionHelper; - public CacheInvocationDelegate() - { - } - @Inject public void initialize(StateTransferManager stateTransferManager, CacheLoaderManager cacheLoaderManager, Notifier notifier, TransactionManager transactionManager, BuddyManager buddyManager, TransactionTable transactionTable, @@ -382,7 +378,8 @@ } } return result; - } else + } + else { InvocationContext ctx = invocationContextContainer.get(); cacheStatusCheck(ctx); @@ -449,7 +446,8 @@ getInvocationContext().getOptionOverrides().setForceAsynchronous(true); PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(null, fqn, key, value, false, true); invoker.invoke(ctx, command); - } else + } + else { if (log.isDebugEnabled()) log.debug("putForExternalRead() called with Fqn " + fqn + " and this node already exists. This method is hence a no op."); Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -28,7 +28,7 @@ @SuppressWarnings("unchecked") public class NodeInvocationDelegate<K, V> extends AbstractInvocationDelegate implements NodeSPI<K, V> { - private UnversionedNode node; + private final UnversionedNode node; private CacheSPI<K, V> spi; public NodeInvocationDelegate(UnversionedNode node) @@ -406,13 +406,13 @@ public V get(K key) { assertValid(); - return (V) spi.get(getFqn(), key); + return spi.get(getFqn(), key); } public V remove(K key) { assertValid(); - return (V) spi.remove(getFqn(), key); + return spi.remove(getFqn(), key); } public void clearData() Modified: core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -86,7 +86,7 @@ /** * Default limit on entries to process asynchronously. */ - public static final int DEFAULT_QUEUE_SIZE = 10000; + private static final int DEFAULT_QUEUE_SIZE = 10000; private AsyncCacheLoaderConfig config; private AsyncProcessor processor; @@ -242,7 +242,7 @@ } private void enqueue(Modification mod) - throws CacheException, InterruptedException + throws CacheException, InterruptedException { if (stopped.get()) { @@ -367,14 +367,14 @@ public String toString() { return super.toString() + - " delegate=[" + super.getCacheLoader() + "]" + - " processor=" + processor + - " stopped=" + stopped + - " batchSize=" + config.getBatchSize() + - " returnOld=" + config.getReturnOld() + - " asyncPut=" + config.getUseAsyncPut() + - " queue.remainingCapacity()=" + queue.remainingCapacity() + - " queue.peek()=" + queue.peek(); + " delegate=[" + super.getCacheLoader() + "]" + + " processor=" + processor + + " stopped=" + stopped + + " batchSize=" + config.getBatchSize() + + " returnOld=" + config.getReturnOld() + + " asyncPut=" + config.getUseAsyncPut() + + " queue.remainingCapacity()=" + queue.remainingCapacity() + + " queue.peek()=" + queue.peek(); } } Modified: core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,13 +1,13 @@ package org.jboss.cache.loader; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.Modification; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.io.ObjectInputStream; +import java.util.List; import java.util.Map; -import java.util.List; -import java.io.ObjectInputStream; /** * Provides ignoreModifications features to all cache loaders. @@ -17,7 +17,7 @@ */ public class ReadOnlyDelegatingCacheLoader extends AbstractDelegatingCacheLoader { - private static Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); + private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); public ReadOnlyDelegatingCacheLoader(CacheLoader cl) { Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -46,7 +46,7 @@ private TcpDelegatingCacheLoaderConfig config; ObjectInputStream in; ObjectOutputStream out; - private static Log log = LogFactory.getLog(TcpDelegatingCacheLoader.class); + private static final Log log = LogFactory.getLog(TcpDelegatingCacheLoader.class); private static Method GET_CHILDREN_METHOD, GET_METHOD, PUT_KEY_METHOD, PUT_DATA_METHOD, REMOVE_KEY_METHOD, REMOVE_METHOD, PUT_MODS_METHOD, EXISTS_METHOD, REMOVE_DATA_METHOD; static Modified: core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -373,7 +373,7 @@ { // changed createIfNull param to true // See http://jira.jboss.com/jira/browse/JBCACHE-118 - return makeDataObject(foundData, true); + return makeDataObject(foundData); } else { @@ -473,7 +473,7 @@ status = cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - map = makeDataObject(foundData, true); + map = makeDataObject(foundData); oldVal = map.put(key, value); cursor.putCurrent(makeDataEntry(map)); } @@ -540,7 +540,7 @@ status = cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - Map map = makeDataObject(foundData, true); + Map map = makeDataObject(foundData); if (values != null) { map.putAll(values); @@ -778,7 +778,7 @@ cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - Map map = makeDataObject(foundData, true); + Map map = makeDataObject(foundData); oldVal = map.remove(key); cursor.putCurrent(makeDataEntry(map)); } @@ -1076,10 +1076,10 @@ * Converts a database entry to a Map. */ @SuppressWarnings("unchecked") - private Map<Object, Object> makeDataObject(DatabaseEntry entry, boolean createIfNull) + private Map<Object, Object> makeDataObject(DatabaseEntry entry) { Map<Object, Object> map = (Map<Object, Object>) serialBinding.entryToObject(entry); - if (createIfNull && map == null) + if (true && map == null) { map = new HashMap<Object, Object>(); } Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -51,7 +51,7 @@ * whether or not to start the server thread as a daemon. Should be false if started from the command line, true if started as an MBean. */ boolean daemon = true; - static Log log = LogFactory.getLog(TcpCacheServer.class); + static final Log log = LogFactory.getLog(TcpCacheServer.class); public String getBindAddress() Modified: core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -18,8 +18,8 @@ */ public class SimpleLock { -// Log log=LogFactory.getLog(getClass()); - private SemaphoreLock sem_; + // Log log=LogFactory.getLog(getClass()); + private final SemaphoreLock sem_; public SimpleLock() { Modified: core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -26,11 +26,11 @@ public class StripedLock { private static final int DEFAULT_CONCURRENCY = 20; - private int lockSegmentMask; - private int lockSegmentShift; + private final int lockSegmentMask; + private final int lockSegmentShift; - ReentrantReadWriteLock[] sharedLocks; - private Log log = LogFactory.getLog(StripedLock.class); + final ReentrantReadWriteLock[] sharedLocks; + private final Log log = LogFactory.getLog(StripedLock.class); /** * This constructor just calls {@link #StripedLock(int)} with a default concurrency value of 20. Modified: core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -8,69 +8,86 @@ /** * Map which reduces concurrency and potential memory leaks for non-static ThreadLocals. * http://www.me.umn.edu/~shivane/blogs/cafefeed/2004/06/of-non-static-threa... + * * @author Brian Dueck * @version $Id$ */ -public class ThreadLocalMap<K, V> implements Map<K, V> { +public class ThreadLocalMap<K, V> implements Map<K, V> +{ - private ThreadLocal threadLocal = new ThreadLocal() { - @Override - protected Object initialValue() { - return new HashMap(); - } - }; + private final ThreadLocal threadLocal = new ThreadLocal() + { + @Override + protected Object initialValue() + { + return new HashMap(); + } + }; - @SuppressWarnings("unchecked") - private Map<K, V> getThreadLocalMap() { - return (Map<K, V>) threadLocal.get(); - } + @SuppressWarnings("unchecked") + private Map<K, V> getThreadLocalMap() + { + return (Map<K, V>) threadLocal.get(); + } - public V put(K key, V value) { - return getThreadLocalMap().put(key, value); - } + public V put(K key, V value) + { + return getThreadLocalMap().put(key, value); + } - public V get(Object key) { - return getThreadLocalMap().get(key); - } + public V get(Object key) + { + return getThreadLocalMap().get(key); + } - public V remove(Object key) { - return getThreadLocalMap().remove(key); - } + public V remove(Object key) + { + return getThreadLocalMap().remove(key); + } - public int size() { - return getThreadLocalMap().size(); - } + public int size() + { + return getThreadLocalMap().size(); + } - public void clear() { - getThreadLocalMap().clear(); - } + public void clear() + { + getThreadLocalMap().clear(); + } - public boolean isEmpty() { - return getThreadLocalMap().isEmpty(); - } + public boolean isEmpty() + { + return getThreadLocalMap().isEmpty(); + } - public boolean containsKey(Object arg0) { - return getThreadLocalMap().containsKey(arg0); - } + public boolean containsKey(Object arg0) + { + return getThreadLocalMap().containsKey(arg0); + } - public boolean containsValue(Object arg0) { - return getThreadLocalMap().containsValue(arg0); - } + public boolean containsValue(Object arg0) + { + return getThreadLocalMap().containsValue(arg0); + } - public Collection<V> values() { - return getThreadLocalMap().values(); - } + public Collection<V> values() + { + return getThreadLocalMap().values(); + } - public void putAll(Map<? extends K, ? extends V> arg0) { - getThreadLocalMap().putAll(arg0); - } + public void putAll(Map<? extends K, ? extends V> arg0) + { + getThreadLocalMap().putAll(arg0); + } - public Set<Map.Entry<K, V>> entrySet() { - return getThreadLocalMap().entrySet(); - } + public Set<Map.Entry<K, V>> entrySet() + { + return getThreadLocalMap().entrySet(); + } - public Set<K> keySet() { - return getThreadLocalMap().keySet(); - } + public Set<K> keySet() + { + return getThreadLocalMap().keySet(); + } } \ No newline at end of file Modified: core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,8 +11,8 @@ */ class RegionalizedReturnValue { - Object returnValue; - Fqn region; + final Object returnValue; + final Fqn region; /** * Creates this value object. Modified: core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,7 +11,7 @@ */ public class UnmarshalledReferences { - private ArrayList<Object> referencedObjects = new ArrayList<Object>(); + private final ArrayList<Object> referencedObjects = new ArrayList<Object>(); /** * Retrieves an object referenced by an id Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -44,7 +44,7 @@ private ComponentRegistry componentRegistry; Marshaller defaultMarshaller; - Map<Integer, Marshaller> marshallers = new HashMap<Integer, Marshaller>(); + final Map<Integer, Marshaller> marshallers = new HashMap<Integer, Marshaller>(); private int versionInt; @Inject Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -13,7 +13,6 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.InvocationContext; -import org.jboss.cache.invocation.InvocationContextContainer; import org.jboss.cache.buddyreplication.BuddyGroup; import org.jboss.cache.factories.annotations.Destroy; import org.jboss.cache.factories.annotations.Inject; @@ -45,9 +44,9 @@ { private static final Log log = LogFactory.getLog(Notifier.class); - private static Class emptyMap = Collections.emptyMap().getClass(); + private static final Class emptyMap = Collections.emptyMap().getClass(); - private static Class singletonMap = Collections.singletonMap(null, null).getClass(); + private static final Class singletonMap = Collections.singletonMap(null, null).getClass(); private static final Class[] allowedMethodAnnotations = { CacheStarted.class, CacheStopped.class, CacheBlocked.class, CacheUnblocked.class, NodeCreated.class, NodeRemoved.class, NodeVisited.class, NodeModified.class, NodeMoved.class, @@ -683,8 +682,8 @@ */ class ListenerInvocation { - private Object target; - private Method method; + private final Object target; + private final Method method; public ListenerInvocation(Object target, Method method) { Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -36,7 +36,7 @@ public class WorkspaceNodeImpl<K, V> extends AbstractNode<K, V> implements WorkspaceNode<K, V> { - private static Log log = LogFactory.getLog(WorkspaceNodeImpl.class); + private static final Log log = LogFactory.getLog(WorkspaceNodeImpl.class); private NodeSPI<K, V> node; private TransactionWorkspace workspace; Modified: core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -15,10 +15,6 @@ static Context instance = null; - public DummyContextFactory() - { - } - /** * Creates an Initial Context for beginning name resolution. * Special requirements of this context are supplied Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -52,7 +52,7 @@ public class TransactionEntry { - private static Log log = LogFactory.getLog(TransactionEntry.class); + private static final Log log = LogFactory.getLog(TransactionEntry.class); /** * Local transaction @@ -67,11 +67,11 @@ /** * List<MethodCall> of modifications ({@link MethodCall}). They will be replicated on TX commit */ - private List<TxCacheCommand> modificationList = new LinkedList<TxCacheCommand>(); + private final List<TxCacheCommand> modificationList = new LinkedList<TxCacheCommand>(); // For some reason we see multiple threads accessing this list - even within the same tx. Could be due to reuse of // tx identifiers in the DummyTM, which is where we see this problem. - private List<TxCacheCommand> classLoadeModList = new CopyOnWriteArrayList<TxCacheCommand>(); + private final List<TxCacheCommand> classLoadeModList = new CopyOnWriteArrayList<TxCacheCommand>(); /** * LinkedHashSet<IdentityLock> of locks acquired by the transaction. We use @@ -79,7 +79,7 @@ * be added multiple times) but also need guaranteed ordering for use * by lock release code (see JBCCACHE-874). */ - private LinkedHashSet<NodeLock> locks = new LinkedHashSet<NodeLock>(); + private final LinkedHashSet<NodeLock> locks = new LinkedHashSet<NodeLock>(); /** * A list of dummy uninitialised nodes created by the cache loader interceptor to load data for a @@ -90,7 +90,7 @@ /** * List<Fqn> of nodes that have been removed by the transaction */ - private List<Fqn> removedNodes = new LinkedList<Fqn>(); + private final List<Fqn> removedNodes = new LinkedList<Fqn>(); public TransactionEntry(Transaction tx) throws SystemException, RollbackException { Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -34,12 +34,12 @@ * and GlobalTransactions. * New: a local TX can have a number of GTXs */ - protected Map<Transaction, GlobalTransaction> tx2gtxMap = new ConcurrentHashMap<Transaction, GlobalTransaction>(); + protected final Map<Transaction, GlobalTransaction> tx2gtxMap = new ConcurrentHashMap<Transaction, GlobalTransaction>(); /** * Mappings between GlobalTransactions and modifications. */ - protected Map<GlobalTransaction, TransactionEntry> gtx2EntryMap = new ConcurrentHashMap<GlobalTransaction, TransactionEntry>(); + protected final Map<GlobalTransaction, TransactionEntry> gtx2EntryMap = new ConcurrentHashMap<GlobalTransaction, TransactionEntry>(); /** * Returns the number of local transactions. Modified: core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,9 +11,9 @@ { private static final long serialVersionUID = -6092752114794052323L; - private K key; + private final K key; - private V value; + private final V value; public SimpleImmutableEntry(Entry<K, V> me) { @@ -49,14 +49,14 @@ return false; Map.Entry e2 = (Map.Entry) o; return (getKey() == null ? e2.getKey() == null : getKey().equals(e2.getKey())) - && (getValue() == null ? e2.getValue() == null : getValue().equals(e2.getValue())); + && (getValue() == null ? e2.getValue() == null : getValue().equals(e2.getValue())); } @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ - (getValue() == null ? 0 : getValue().hashCode()); + (getValue() == null ? 0 : getValue().hashCode()); } @Override Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -19,7 +19,7 @@ */ public class ReflectionUtil { - private static Log log = LogFactory.getLog(ReflectionUtil.class); + private static final Log log = LogFactory.getLog(ReflectionUtil.class); /** * Returns a set of Methods that contain the given method annotation. This includes all public, protected, package and private Modified: core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -32,7 +32,7 @@ */ public class XmlHelper { - private static Log log = LogFactory.getLog(XmlHelper.class); + private static final Log log = LogFactory.getLog(XmlHelper.class); /** * The root of a JBoss Cache configuration XML file. This is the <tt>&lt;mbean&gt;</tt> tag.