[jboss-cvs] JBossCache/src/org/jboss/cache ...
Manik Surtani
msurtani at jboss.com
Wed Jan 17 09:13:06 EST 2007
User: msurtani
Date: 07/01/17 09:13:06
Modified: src/org/jboss/cache CacheImpl.java
Log:
JBCACHE-908
Revision Changes Path
1.31 +47 -43 JBossCache/src/org/jboss/cache/CacheImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- CacheImpl.java 17 Jan 2007 01:31:06 -0000 1.30
+++ CacheImpl.java 17 Jan 2007 14:13:06 -0000 1.31
@@ -58,7 +58,6 @@
import org.jgroups.util.Rsp;
import org.jgroups.util.RspList;
import org.jgroups.util.Util;
-import org.w3c.dom.Element;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -95,7 +94,7 @@
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
* @author Brian Stansberry
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Id: CacheImpl.java,v 1.30 2007/01/17 01:31:06 genman Exp $
+ * @version $Id: CacheImpl.java,v 1.31 2007/01/17 14:13:06 msurtani Exp $
* <p/>
* @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
*/
@@ -231,9 +230,11 @@
private boolean started;
- private ThreadLocal<InvocationContext> invocationContextContainer = new ThreadLocal<InvocationContext>() {
+ private ThreadLocal<InvocationContext> invocationContextContainer = new ThreadLocal<InvocationContext>()
+ {
@Override
- protected InvocationContext initialValue() {
+ protected InvocationContext initialValue()
+ {
return new InvocationContext();
}
};
@@ -459,7 +460,7 @@
public void fetchPartialState(Object sources[], Fqn sourceTarget, Fqn integrationTarget) throws Exception
{
- String encodedStateId = sourceTarget + StateTransferManager.PARTIAL_STATE_DELIMETER + integrationTarget;
+ String encodedStateId = sourceTarget + StateTransferManager.PARTIAL_STATE_DELIMITER + integrationTarget;
fetchPartialState(sources, encodedStateId);
}
@@ -2761,7 +2762,7 @@
* pertaining to the Fqn passed in is activated, and has an appropriate ClassLoader.
*
* @param fqn the fqn to gravitate
- * @param searchBuddyBackupSubtrees if true, buddy backup subtrees are searched and if false, they are not.
+ * @param searchSubtrees if true, buddy backup subtrees are searched and if false, they are not.
* @return a GravitateResult which contains the data for the gravitation
*/
public GravitateResult gravitateData(Fqn fqn, boolean searchSubtrees)
@@ -3237,7 +3238,7 @@
try
{
in = new MarshalledValueInputStream(bais);
- getStateTransferManager().setState(in, Fqn.ROOT, null);
+ getStateTransferManager().setState(in, Fqn.ROOT);
stateReceivedSuccess();
}
catch (Throwable t)
@@ -3261,10 +3262,10 @@
String sourceRoot = state_id;
byte[] result = null;
- boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMETER) > 0;
+ boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMITER) > 0;
if (hasDifferentSourceAndIntegrationRoots)
{
- sourceRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMETER)[0];
+ sourceRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMITER)[0];
}
try
@@ -3309,10 +3310,10 @@
{
String sourceRoot = state_id;
MarshalledValueOutputStream out = null;
- boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMETER) > 0;
+ boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMITER) > 0;
if (hasDifferentSourceAndIntegrationRoots)
{
- sourceRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMETER)[0];
+ sourceRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMITER)[0];
}
try
{
@@ -3340,7 +3341,7 @@
try
{
in = new MarshalledValueInputStream(istream);
- getStateTransferManager().setState(in, Fqn.ROOT, null);
+ getStateTransferManager().setState(in, Fqn.ROOT);
stateReceivedSuccess();
}
catch (Throwable t)
@@ -3368,25 +3369,26 @@
MarshalledValueInputStream in = null;
String targetRoot = state_id;
- boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMETER) > 0;
+ boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMITER) > 0;
if (hasDifferentSourceAndIntegrationRoots)
{
- targetRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMETER)[1];
+ targetRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMITER)[1];
}
try
{
log.debug("Setting received partial state for subroot " + state_id);
Fqn subroot = Fqn.fromString(targetRoot);
- Region region = regionManager.getRegion(subroot, false);
- ClassLoader cl = null;
- if (region != null)
- {
- // If a classloader is registered for the node's region, use it
- cl = region.getClassLoader();
- }
+// Region region = regionManager.getRegion(subroot, false);
+// ClassLoader cl = null;
+// if (region != null)
+// {
+// // If a classloader is registered for the node's region, use it
+// cl = region.getClassLoader();
+// }
ByteArrayInputStream bais = new ByteArrayInputStream(state);
in = new MarshalledValueInputStream(bais);
- getStateTransferManager().setState(in, subroot, cl);
+ //getStateTransferManager().setState(in, subroot, cl);
+ getStateTransferManager().setState(in, subroot);
stateReceivedSuccess();
}
catch (Throwable t)
@@ -3408,10 +3410,10 @@
{
String targetRoot = state_id;
MarshalledValueInputStream in = null;
- boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMETER) > 0;
+ boolean hasDifferentSourceAndIntegrationRoots = state_id.indexOf(StateTransferManager.PARTIAL_STATE_DELIMITER) > 0;
if (hasDifferentSourceAndIntegrationRoots)
{
- targetRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMETER)[1];
+ targetRoot = state_id.split(StateTransferManager.PARTIAL_STATE_DELIMITER)[1];
}
if (istream == null)
{
@@ -3424,14 +3426,15 @@
log.debug("Setting received partial state for subroot " + state_id);
in = new MarshalledValueInputStream(istream);
Fqn subroot = Fqn.fromString(targetRoot);
- Region region = regionManager.getRegion(subroot, false);
- ClassLoader cl = null;
- if (region != null)
- {
- // If a classloader is registered for the node's region, use it
- cl = region.getClassLoader();
- }
- getStateTransferManager().setState(in, subroot, cl);
+// Region region = regionManager.getRegion(subroot, false);
+// ClassLoader cl = null;
+// if (region != null)
+// {
+// // If a classloader is registered for the node's region, use it
+// cl = region.getClassLoader();
+// }
+ //getStateTransferManager().setState(in, subroot, cl);
+ getStateTransferManager().setState(in, subroot);
stateReceivedSuccess();
}
catch (Throwable t)
@@ -3454,7 +3457,8 @@
/*----------------------- MembershipListener ------------------------*/
- protected class MembershipListenerAdaptor implements ExtendedMembershipListener {
+ protected class MembershipListenerAdaptor implements ExtendedMembershipListener
+ {
public void viewAccepted(View new_view)
{
More information about the jboss-cvs-commits
mailing list