[jboss-cvs] JBossAS SVN: r107155 - in projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server: lock and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 28 10:57:59 EDT 2010
Author: pferraro
Date: 2010-07-28 10:57:58 -0400 (Wed, 28 Jul 2010)
New Revision: 107155
Modified:
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceEventFactory.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceImpl.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HATarget.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/MarshalledValueObjectStreamSource.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/SimpleCachableMarshalledValue.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/LocalAndClusterLockManager.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/SharedLocalYieldingClusterLockManager.java
projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
Log:
Fix compiler warnings
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceEventFactory.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceEventFactory.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceEventFactory.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -30,6 +30,7 @@
/**
* @see org.jboss.ha.framework.server.EventFactory#createEvent(HAService, java.lang.String)
*/
+ @Override
public HAServiceEvent createEvent(Object source, String type)
{
return new HAServiceEvent(source, type);
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceImpl.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceImpl.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HAServiceImpl.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -81,6 +81,7 @@
/**
* @see org.jboss.ha.framework.server.EventFacility#notifyListeners(java.util.EventObject)
*/
+ @Override
public void notifyListeners(E event)
{
for (EventListener<E> listener: this.eventListeners)
@@ -99,6 +100,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#getHAPartition()
*/
+ @Override
public HAPartition getHAPartition()
{
return this.partition;
@@ -107,6 +109,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#setHAPartition(org.jboss.ha.framework.interfaces.HAPartition)
*/
+ @Override
public void setHAPartition(HAPartition partition)
{
this.partition = partition;
@@ -115,6 +118,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#isRegisterThreadContextClassLoader()
*/
+ @Override
public boolean isRegisterThreadContextClassLoader()
{
return this.registerClassLoader;
@@ -123,11 +127,13 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#setRegisterThreadContextClassLoader(boolean)
*/
+ @Override
public void setRegisterThreadContextClassLoader(boolean registerClassLoader)
{
this.registerClassLoader = registerClassLoader;
}
+ @Override
public String getServiceHAName()
{
return this.name;
@@ -136,6 +142,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#setServiceHAName(java.lang.String)
*/
+ @Override
public void setServiceHAName(String name)
{
this.name = name;
@@ -144,6 +151,7 @@
/**
* @see org.jboss.ha.framework.interfaces.EventListener#handleEvent(java.util.EventObject)
*/
+ @Override
public void handleEvent(E event) throws Exception
{
this.callAsyncMethodOnPartition("handleEvent", new Object[] { event }, HANDLE_EVENT_TYPES);
@@ -167,6 +175,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#create()
*/
+ @Override
public void create() throws Exception
{
}
@@ -174,6 +183,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#start()
*/
+ @Override
public void start() throws Exception
{
this.registerRPCHandler();
@@ -184,6 +194,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#stop()
*/
+ @Override
public void stop()
{
try
@@ -201,6 +212,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService#destroy()
*/
+ @Override
public void destroy()
{
}
@@ -265,6 +277,7 @@
* {@inheritDoc}
* @return the key used by the DRM and partition rpc handler mapping.
*/
+ @Override
public String getHAServiceKey()
{
return this.name;
@@ -281,6 +294,7 @@
/**
* @see org.jboss.ha.framework.interfaces.DistributedReplicantManager.ReplicantListener#replicantsChanged(java.lang.String, java.util.List, int, boolean)
*/
+ @Override
public void replicantsChanged(String key, List<?> newReplicants, int newReplicantsViewId, boolean merge)
{
if (key.equals(this.getHAServiceKey()))
@@ -308,6 +322,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HAService.RpcHandler#handleNotification(java.lang.Object)
*/
+ @Override
public void handleEvent(E event) throws Exception
{
HAServiceImpl.this.getEventFacility().notifyListeners(event);
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -62,26 +62,31 @@
this.singletonLifecycle = this;
}
+ @Override
public HASingletonElectionPolicy getElectionPolicy()
{
return this.electionPolicy;
}
+ @Override
public void setElectionPolicy(HASingletonElectionPolicy electionPolicy)
{
this.electionPolicy = electionPolicy;
}
+ @Override
public boolean getRestartOnMerge()
{
return this.restartOnMerge;
}
+ @Override
public void setRestartOnMerge(boolean restart)
{
this.restartOnMerge = restart;
}
+ @Override
public boolean isMasterNode()
{
return this.master.get();
@@ -128,6 +133,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HASingletonLifecycle#startSingleton()
*/
+ @Override
public void startSingleton()
{
this.log.debug("startSingleton() : elected for master singleton node");
@@ -136,6 +142,7 @@
/**
* @see org.jboss.ha.framework.interfaces.HASingletonLifecycle#stopSingleton()
*/
+ @Override
public void stopSingleton()
{
this.log.debug("stopSingleton() : another node in the partition (if any) is elected for master");
@@ -218,6 +225,7 @@
/**
* @see org.jboss.ha.singleton.HASingleton.RpcHandler#stopOldMaster()
*/
+ @Override
public void stopOldMaster() throws Exception
{
// ovidiu 09/02/04 - temporary solution for Case 1843, use an asynchronous
@@ -326,6 +334,7 @@
/**
* @see org.jboss.ha.singleton.HASingleton.RpcHandler#stopOldMaster()
*/
+ @Override
public void stopOldMaster()
{
HASingletonImpl.this.stopIfMaster();
@@ -363,6 +372,7 @@
class RecordingReplicantListener implements DistributedReplicantManager.ReplicantListener
{
+ @Override
public void replicantsChanged(String key, List<?> newReplicants, int newReplicantsViewId, boolean merge)
{
if (HASingletonImpl.this.getHAServiceKey().equals(key))
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HATarget.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HATarget.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HATarget.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -101,6 +101,7 @@
updateHAPartition(partition);
}
+ @Override
public String toString()
{
return new StringBuilder(super.toString())
@@ -125,7 +126,7 @@
*/
public long getCurrentViewId()
{
- return (long)clusterViewId;
+ return clusterViewId;
}
/**
@@ -264,10 +265,7 @@
// if we arrive here, it means that the status has been changed, so
// we check for the decision:
//
- if (this.allowInvocationsStatus == ENABLE_INVOCATIONS)
- return true;
- else
- return false;
+ return (this.allowInvocationsStatus == ENABLE_INVOCATIONS);
}
else
return false;
@@ -280,6 +278,7 @@
// DistributedReplicantManager.ReplicantListener implementation ------------
+ @Override
public void replicantsChanged(String key, List<?> newReplicants, int newReplicantsViewId, boolean merge)
{
log.debug("replicantsChanged '" + replicantName +
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/MarshalledValueObjectStreamSource.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/MarshalledValueObjectStreamSource.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/MarshalledValueObjectStreamSource.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -39,15 +39,15 @@
*/
public class MarshalledValueObjectStreamSource implements ObjectStreamSource
{
-
+ @Override
public ObjectInput getObjectInput(InputStream source) throws IOException
{
return new MarshalledValueInputStream(source);
}
+ @Override
public ObjectOutput getObjectOutput(OutputStream target) throws IOException
{
return new MarshalledValueOutputStream(target);
}
-
}
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/SimpleCachableMarshalledValue.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/SimpleCachableMarshalledValue.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/SimpleCachableMarshalledValue.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -151,6 +151,7 @@
this.objectStreamSource = streamSource;
}
+ @Override
public synchronized Serializable get() throws IOException, ClassNotFoundException
{
if (raw == null)
@@ -173,6 +174,7 @@
return raw;
}
+ @Override
public synchronized byte[] toByteArray() throws IOException
{
if (serializedForm == null)
@@ -300,6 +302,7 @@
* @throws ClassNotFoundException If the class for an object being
* restored cannot be found.
*/
+ @Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
int length = in.readInt();
@@ -328,6 +331,7 @@
*
* @throws IOException Includes any I/O exceptions that may occur
*/
+ @Override
public synchronized void writeExternal(ObjectOutput out) throws IOException
{
byte[] bytes = serialize();
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -59,7 +59,7 @@
{
private final AbstractClusterLockSupport mgr;
- private RpcTarget(AbstractClusterLockSupport mgr)
+ RpcTarget(AbstractClusterLockSupport mgr)
{
this.mgr = mgr;
}
@@ -327,6 +327,7 @@
// ---------------------------------------------------- GroupMembershipListener
+ @Override
public synchronized void membershipChanged(List<ClusterNode> deadMembers, List<ClusterNode> newMembers, List<ClusterNode> allMembers)
{
this.members.clear();
@@ -346,7 +347,7 @@
Set<ClusterLockState> copy = new HashSet<ClusterLockState>(deadMemberLocks);
for (ClusterLockState lockState : copy)
{
- releaseRemoteLock(lockState.lockId, (ClusterNode) deadMember);
+ releaseRemoteLock(lockState.lockId, deadMember);
}
}
}
@@ -354,6 +355,7 @@
}
}
+ @Override
public void membershipChangedDuringMerge(List<ClusterNode> deadMembers, List<ClusterNode> newMembers,
List<ClusterNode> allMembers, List<List<ClusterNode>> originatingGroups)
{
@@ -419,7 +421,7 @@
/**
* Called by a remote node via RpcTarget.
*/
- private RemoteLockResponse remoteLock(Serializable lockName, ClusterNode caller, long timeout)
+ RemoteLockResponse remoteLock(Serializable lockName, ClusterNode caller, long timeout)
{
RemoteLockResponse response = null;
ClusterLockState lockState = getClusterLockState(lockName);
@@ -477,7 +479,7 @@
/**
* Called by a remote node via RpcTarget.
*/
- private void releaseRemoteLock(Serializable categoryName, ClusterNode caller)
+ void releaseRemoteLock(Serializable categoryName, ClusterNode caller)
{
ClusterLockState lockState = getClusterLockState(categoryName, false);
if (lockState != null && lockState.state.get() == State.LOCKED)
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/LocalAndClusterLockManager.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/LocalAndClusterLockManager.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/LocalAndClusterLockManager.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -54,14 +54,14 @@
public class LocalAndClusterLockManager
{
- private class LocalLock
+ class LocalLock
{
- private volatile ClusterNode holder;
+ volatile ClusterNode holder;
private final AtomicBoolean locked = new AtomicBoolean(false);
private final Queue<Thread> waiters = new ConcurrentLinkedQueue<Thread>();
- private void lock(ClusterNode caller, long timeout) throws TimeoutException
+ void lock(ClusterNode caller, long timeout) throws TimeoutException
{
long deadline = System.currentTimeMillis() + timeout;
boolean wasInterrupted = false;
@@ -71,16 +71,14 @@
try
{
// Block while not first in queue or cannot acquire lock
- while (waiters.peek() != current ||
- !locked.compareAndSet(false, true))
+ while (waiters.peek() != current || !locked.compareAndSet(false, true))
{
LockSupport.parkUntil(deadline);
if (Thread.interrupted()) // ignore interrupts while waiting
wasInterrupted = true;
if (System.currentTimeMillis() >= deadline)
{
- if (waiters.peek() != current ||
- !locked.compareAndSet(false, true))
+ if (waiters.peek() != current || !locked.compareAndSet(false, true))
{
throw new TimeoutException(this.holder);
}
@@ -105,7 +103,7 @@
}
}
- private void unlock(ClusterNode caller)
+ void unlock(ClusterNode caller)
{
if (caller.equals(holder))
{
@@ -113,38 +111,41 @@
holder = null;
LockSupport.unpark(waiters.peek());
}
- }
-
-
+ }
}
/** Handles callbacks from the cluster lock support object */
- private class ClusterHandler implements LocalLockHandler
+ class ClusterHandler implements LocalLockHandler
{
// ----------------------------------------------------- LocalLockHandler
+ @Override
public ClusterNode getLocalNode(ClusterNode localNode)
{
return LocalAndClusterLockManager.this.localNode;
}
+ @Override
public void setLocalNode(ClusterNode localNode)
{
LocalAndClusterLockManager.this.localNode = localNode;
}
+ @Override
public void lockFromCluster(Serializable lockName, ClusterNode caller, long timeout) throws TimeoutException,
InterruptedException
{
LocalAndClusterLockManager.this.doLock(lockName, caller, timeout);
}
+ @Override
public ClusterNode getLockHolder(Serializable lockName)
{
LocalLock lock = LocalAndClusterLockManager.this.getLocalLock(lockName, false);
return lock == null ? null : lock.holder;
}
+ @Override
public void unlockFromCluster(Serializable lockName, ClusterNode caller)
{
LocalAndClusterLockManager.this.doUnlock(lockName, caller);
@@ -152,7 +153,7 @@
}
- private ClusterNode localNode;
+ ClusterNode localNode;
private ConcurrentMap<Serializable, LocalLock> localLocks = new ConcurrentHashMap<Serializable, LocalLock>();
private final NonGloballyExclusiveClusterLockSupport clusterSupport;
@@ -257,7 +258,7 @@
// ----------------------------------------------------------------- Private
- private LocalLock getLocalLock(Serializable categoryName, boolean create)
+ LocalLock getLocalLock(Serializable categoryName, boolean create)
{
LocalLock category = localLocks.get(categoryName);
if (category == null && create)
@@ -272,14 +273,13 @@
return category;
}
- private void doLock(Serializable lockName, ClusterNode caller, long timeout) throws TimeoutException,
- InterruptedException
+ void doLock(Serializable lockName, ClusterNode caller, long timeout) throws TimeoutException
{
LocalLock lock = getLocalLock(lockName, true);
lock.lock(caller, timeout);
}
- private void doUnlock(Serializable lockName, ClusterNode caller)
+ void doUnlock(Serializable lockName, ClusterNode caller)
{
LocalLock lock = getLocalLock(lockName, false);
if (lock != null)
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -64,6 +64,7 @@
// ------------------------------------------------------------------ Public
+ @Override
public void unlock(Serializable lockId)
{
ClusterNode myself = getLocalClusterNode();
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/SharedLocalYieldingClusterLockManager.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/SharedLocalYieldingClusterLockManager.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/SharedLocalYieldingClusterLockManager.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -70,11 +70,11 @@
NEW_LOCK
}
- private class LocalLock
+ class LocalLock
{
- private volatile boolean removable;
+ volatile boolean removable;
private final Queue<Thread> waiters = new ConcurrentLinkedQueue<Thread>();
- private final AtomicReference<LockState> lockState = new AtomicReference<LockState>(LockState.AVAILABLE);
+ final AtomicReference<LockState> lockState = new AtomicReference<LockState>(LockState.AVAILABLE);
/**
* Just takes the lock for the local node. This should only be invoked
@@ -83,7 +83,7 @@
*
* @return the LockState after the lock is taken.
*/
- private LockState lockForLocalNode()
+ LockState lockForLocalNode()
{
LockState lockedState = null;
for (;;)
@@ -106,7 +106,7 @@
* @return the LockState after the lock is taken
* @throws TimeoutException if the lock cannot be acquired within <code>timeout</code> ms
*/
- private LockState lockForRemoteNode(ClusterNode caller, long timeout) throws TimeoutException
+ LockState lockForRemoteNode(ClusterNode caller, long timeout) throws TimeoutException
{
LockState lockedState = null;
@@ -162,7 +162,7 @@
*
* @throws IllegalStateException if <code>caller</code> is not the local node
*/
- private void unlock(ClusterNode caller)
+ void unlock(ClusterNode caller)
{
LockState current = lockState.get();
if (caller.equals(current.lockHolder))
@@ -177,10 +177,7 @@
{
break;
}
- else
- {
- current = lockState.get();
- }
+ current = lockState.get();
}
}
else
@@ -210,7 +207,7 @@
}
}
- private LockState registerForLocalLock()
+ LockState registerForLocalLock()
{
LockState current = lockState.get();
LockState newState = null;
@@ -221,10 +218,7 @@
{
break;
}
- else
- {
- current = lockState.get();
- }
+ current = lockState.get();
}
return newState;
}
@@ -238,12 +232,12 @@
private static class LockState
{
/** The standard initial state */
- private static final LockState AVAILABLE = new LockState(0, null, null, null, false);
+ static final LockState AVAILABLE = new LockState(0, null, null, null, false);
/** Number of local callers that have locked or want to lock */
- private final int localLockCount;
+ final int localLockCount;
/** The node that holds the lock */
- private final ClusterNode lockHolder;
+ final ClusterNode lockHolder;
/** The node that last held the lock, if currently unheld */
private final ClusterNode lastHolder;
/**
@@ -252,9 +246,9 @@
* threads have subsequently registered interest and need to be notified
* of the result.
*/
- private final Thread latestRegistrant;
+ final Thread latestRegistrant;
/** Flag indicating the lock object is no longer valid and callers should obtain a new one */
- private final boolean invalid;
+ final boolean invalid;
private LockState(int localLockCount, ClusterNode lockHolder, ClusterNode lastHolder, Thread latestRegistrant, boolean invalid)
{
@@ -273,7 +267,7 @@
* @return a LockState with a lock count one higher than this one and with
* the current thread as latestRegistrant
*/
- private LockState register(ClusterNode registrant)
+ LockState register(ClusterNode registrant)
{
ClusterNode newHolder = (lockHolder == null && lastHolder == registrant) ? registrant : lockHolder;
ClusterNode newLast = newHolder == null ? lastHolder : null;
@@ -292,7 +286,7 @@
* if <code>decrement</code> is <code>true</code> will have a lock
* count one less than this one
*/
- private LockState unregister(boolean decrement)
+ LockState unregister(boolean decrement)
{
Thread registrant = (latestRegistrant == Thread.currentThread() ? null : latestRegistrant);
int newCount = decrement ? localLockCount - 1 : localLockCount;
@@ -308,7 +302,7 @@
* @return a LockState with a lock count one higher than this one and with
* <code>owner</code> as the lock holder
*/
- private LockState takeLocal(ClusterNode owner)
+ LockState takeLocal(ClusterNode owner)
{
Thread registrant = (latestRegistrant == Thread.currentThread() ? null : latestRegistrant);
return new LockState(localLockCount + 1, owner, null, registrant, invalid);
@@ -321,7 +315,7 @@
* @return a LockState with a lock count one lower than this one and potentially
* with no lock holder
*/
- private LockState releaseLock()
+ LockState releaseLock()
{
return localLockCount == 1
? new LockState(0, null, lockHolder, latestRegistrant, invalid)
@@ -336,7 +330,7 @@
*
* @return a LockState with <code>owner</code> as lock holder
*/
- private LockState takeRemote(ClusterNode owner)
+ LockState takeRemote(ClusterNode owner)
{
return new LockState(localLockCount, owner, null, latestRegistrant, invalid);
}
@@ -348,7 +342,7 @@
// return new LockState(localLockCount, null, null, latestRegistrant, invalid);
// }
- private LockState invalidate()
+ LockState invalidate()
{
return new LockState(localLockCount, lockHolder, null, latestRegistrant, true);
}
@@ -360,22 +354,24 @@
* separate class to avoid exposing the LocalLockHandler in the top
* level class' API.
*/
- private class ClusterHandler implements LocalLockHandler
+ class ClusterHandler implements LocalLockHandler
{
// ----------------------------------------------------- LocalLockHandler
+ @Override
public ClusterNode getLocalNode(ClusterNode localNode)
{
return SharedLocalYieldingClusterLockManager.this.localNode;
}
+ @Override
public void setLocalNode(ClusterNode localNode)
{
SharedLocalYieldingClusterLockManager.this.localNode = localNode;
}
- public void lockFromCluster(Serializable lockName, ClusterNode caller, long timeout) throws TimeoutException,
- InterruptedException
+ @Override
+ public void lockFromCluster(Serializable lockName, ClusterNode caller, long timeout) throws TimeoutException, InterruptedException
{
LocalLock lock = getLocalLock(lockName, true);
@@ -413,10 +409,7 @@
{
break;
}
- else
- {
- currentState = lock.lockState.get();
- }
+ currentState = lock.lockState.get();
}
if (invalidated.latestRegistrant != null)
@@ -430,12 +423,14 @@
}
}
+ @Override
public ClusterNode getLockHolder(Serializable lockName)
{
LocalLock lock = getLocalLock(lockName, false);
return lock == null ? null : lock.lockState.get().lockHolder;
}
+ @Override
public void unlockFromCluster(Serializable lockName, ClusterNode caller)
{
LocalLock lock = getLocalLock(lockName, false);
@@ -447,8 +442,8 @@
}
- private ClusterNode localNode;
- private ConcurrentMap<Serializable, LocalLock> localLocks = new ConcurrentHashMap<Serializable, LocalLock>();
+ ClusterNode localNode;
+ ConcurrentMap<Serializable, LocalLock> localLocks = new ConcurrentHashMap<Serializable, LocalLock>();
private final YieldingGloballyExclusiveClusterLockSupport clusterSupport;
public SharedLocalYieldingClusterLockManager(String serviceHAName, HAPartition partition)
@@ -669,9 +664,7 @@
this.clusterSupport.stop();
}
- // ----------------------------------------------------------------- Private
-
- private LocalLock getLocalLock(Serializable categoryName, boolean create)
+ LocalLock getLocalLock(Serializable categoryName, boolean create)
{
LocalLock category = localLocks.get(categoryName);
if (category == null && create)
Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java 2010-07-28 14:42:40 UTC (rev 107154)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java 2010-07-28 14:57:58 UTC (rev 107155)
@@ -62,6 +62,7 @@
// ------------------------------------------------------ ClusterLockManager
+ @Override
public void unlock(Serializable lockId)
{
ClusterNode myself = getLocalClusterNode();
@@ -99,10 +100,7 @@
{
return getLock(lockState.lockId, lockState, caller, timeout);
}
- else
- {
- return new RemoteLockResponse(getLocalClusterNode(), RemoteLockResponse.Flag.REJECT, lockState.getHolder());
- }
+ return new RemoteLockResponse(getLocalClusterNode(), RemoteLockResponse.Flag.REJECT, lockState.getHolder());
}
@Override
More information about the jboss-cvs-commits
mailing list