[jboss-cvs] JBossCache/src/org/jboss/cache/optimistic ...
Manik Surtani
manik at jboss.org
Fri Jul 20 11:28:20 EDT 2007
User: msurtani
Date: 07/07/20 11:28:20
Modified: src/org/jboss/cache/optimistic WorkspaceNodeImpl.java
WorkspaceNode.java
Log:
JBCACHE-1067
Revision Changes Path
1.59 +21 -11 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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- WorkspaceNodeImpl.java 9 Jul 2007 13:14:26 -0000 1.58
+++ WorkspaceNodeImpl.java 20 Jul 2007 15:28:20 -0000 1.59
@@ -38,7 +38,7 @@
private NodeSPI<K, V> node;
private TransactionWorkspace workspace;
private DataVersion version = DefaultDataVersion.ZERO;
- private boolean dirty;
+ private boolean modified;
private boolean created;
private boolean childrenModified;
private Map<Object, NodeSPI<K, V>> optimisticChildNodeMap;
@@ -78,11 +78,21 @@
}
/**
- * 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()
@@ -93,7 +103,7 @@
public void putAll(Map<K, V> data)
{
realPut(data, false);
- dirty = true;
+ modified = true;
}
public void replaceAll(Map<K, V> data)
@@ -104,14 +114,14 @@
public V put(K key, V value)
{
- dirty = true;
+ modified = true;
return optimisticDataMap.put(key, value);
}
public V remove(K key)
{
- dirty = true;
+ modified = true;
return optimisticDataMap.remove(key);
}
@@ -139,7 +149,7 @@
private void realPut(Map<K, V> data, boolean eraseData, boolean forceDirtyFlag)
{
- if (forceDirtyFlag) dirty = true;
+ if (forceDirtyFlag) modified = true;
if (eraseData)
{
optimisticDataMap.clear();
@@ -232,8 +242,8 @@
public void markAsCreated()
{
created = true;
- // created != dirty!!!
-// dirty = true;
+ // created != modified!!!
+// modified = true;
}
public Map<K, V> getData()
@@ -245,7 +255,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 getClass().getSimpleName() + " [ fqn=" + getFqn() + " " + sb + "ver=" + version + " " + (versioningImplicit ? "implicit" : "explicit") + "]";
}
@@ -297,7 +307,7 @@
public void clearData()
{
- dirty = true;
+ modified = true;
optimisticDataMap.clear();
}
1.27 +11 -4 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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- WorkspaceNode.java 12 Mar 2007 18:13:46 -0000 1.26
+++ WorkspaceNode.java 20 Jul 2007 15:28:20 -0000 1.27
@@ -49,11 +49,18 @@
void setVersion(DataVersion version);
/**
- * 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 needs merging, false otherwise.
+ * @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 the node has been either created, deleted or modified.
*/
boolean isDirty();
More information about the jboss-cvs-commits
mailing list