[jboss-cvs] JBossCache/src/org/jboss/cache/optimistic ...
Manik Surtani
manik at jboss.org
Fri Jul 20 11:27:04 EDT 2007
User: msurtani
Date: 07/07/20 11:27:04
Modified: src/org/jboss/cache/optimistic Tag:
Branch_JBossCache_1_4_0 WorkspaceNodeImpl.java
WorkspaceNode.java
Log:
JBCACHE-1067
Revision Changes Path
No revision
No revision
1.21.2.8 +26 -18 JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WorkspaceNodeImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java,v
retrieving revision 1.21.2.7
retrieving revision 1.21.2.8
diff -u -b -r1.21.2.7 -r1.21.2.8
--- WorkspaceNodeImpl.java 20 Apr 2007 13:09:41 -0000 1.21.2.7
+++ WorkspaceNodeImpl.java 20 Jul 2007 15:27:04 -0000 1.21.2.8
@@ -15,21 +15,20 @@
import org.jboss.cache.OptimisticTreeNode;
import org.jboss.cache.TreeCache;
import org.jboss.cache.TreeNode;
-import org.jboss.cache.Node;
import org.jboss.cache.factories.NodeFactory;
import org.jboss.cache.lock.IdentityLock;
import org.jboss.cache.lock.LockingException;
import org.jboss.cache.lock.TimeoutException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
/**
* Wraps a DataNode and adds versioning and other meta data to it.
@@ -47,7 +46,7 @@
private TransactionWorkspace workspace;
private DataVersion version = DefaultDataVersion.ZERO;
private boolean deleted;
- private boolean dirty;
+ private boolean modified;
private boolean created;
private Map optimisticChildNodeMap;
private Map optimisticDataMap;
@@ -101,11 +100,20 @@
}
/**
- * Returns true if this node is dirty.
+ * Returns true if this node is modified.
+ */
+ public boolean isModified()
+ {
+ return modified;
+ }
+
+ /**
+ * A convenience method that returns whether a node is dirty, i.e., it has been created, deleted or modified.
+ * @return true if the node has been either created, deleted or modified.
*/
public boolean isDirty()
{
- return dirty;
+ return modified || created || deleted;
}
public Fqn getFqn()
@@ -116,25 +124,25 @@
public void put(Map data, boolean eraseData)
{
realPut(data, eraseData);
- dirty = true;
+ modified = true;
}
public void put(Map data)
{
realPut(data, false);
- dirty = true;
+ modified = true;
}
public Object put(Object key, Object value)
{
- dirty = true;
+ modified = true;
return optimisticDataMap.put(key, value);
}
public Object remove(Object key)
{
- dirty = true;
+ modified = true;
return optimisticDataMap.remove(key);
}
@@ -142,7 +150,7 @@
public void clear()
{
optimisticDataMap.clear();
- dirty = true;
+ modified = true;
}
public Object get(Object key)
@@ -168,7 +176,7 @@
private void realPut(Map data, boolean eraseData, boolean forceDirtyFlag)
{
- if (forceDirtyFlag) dirty = true;
+ if (forceDirtyFlag) modified = true;
if (eraseData)
{
optimisticDataMap.clear();
@@ -374,8 +382,8 @@
public void markAsCreated()
{
created = true;
- // created != dirty!!
-// dirty = true;
+ // created != modified!!
+// modified = true;
}
/**
@@ -621,7 +629,7 @@
{
StringBuffer sb = new StringBuffer();
if (deleted) sb.append("del ");
- if (dirty) sb.append("dirty ");
+ if (modified) sb.append("modified ");
if (created) sb.append("new ");
return
"WorkNode fqn=" + getFqn() + " " + sb + "ver=" + version;
1.12.2.4 +13 -6 JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WorkspaceNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- WorkspaceNode.java 7 Mar 2007 22:46:29 -0000 1.12.2.3
+++ WorkspaceNode.java 20 Jul 2007 15:27:04 -0000 1.12.2.4
@@ -11,9 +11,9 @@
import org.jboss.cache.TreeCache;
import org.jboss.cache.TreeNode;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.List;
/**
* Represents a type of {@link org.jboss.cache.Node} that is to be copied into a {@link TransactionWorkspace} for optimistically locked
@@ -37,11 +37,18 @@
Set getKeys();
/**
- * Returns true if this node needs to be merged when the transaction commits. A node is considered dirty if it
- * has just been created, deleted or it's data map has changed. If children are added or removed, the node is not
- * considered dirty - instead, see {@link #isChildrenModified()}.
+ * A node is considered modified if it's data map has changed. If children are added or removed, the node is not
+ * considered modified - instead, see {@link #isChildrenModified()}.
+ *
+ * @return true if the data map has been modified
+ */
+ boolean isModified();
+
+ /**
+ * A convenience method that returns whether a node is dirty, i.e., it has been created, deleted or modified.
+ * Noe that adding or removing children does not constitute a node being dirty - see {@link #isChildrenModified()}
*
- * @return true if needs merging, false otherwise.
+ * @return true if the node has been either created, deleted or modified.
*/
boolean isDirty();
More information about the jboss-cvs-commits
mailing list