antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Fix bug 649: Don't mark node as modified on transient property change.

Browse source 
<http://helma.org/bugs/show_bug.cgi?id=649>
This commit is contained in:
hns 2008-11-05 14:28:03 +00:00
parent 57b5275705
commit 941395437b
1 changed files with 40 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/helma/objectmodel/db/Node.java
View file

@ -1968,7 +1968,10 @@ public final class Node implements INode, Serializable {
* @param value ... * @param value ...
*/ */
protected void set(String propname, Object value, int type) { protected void set(String propname, Object value, int type) {
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -1987,7 +1990,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2000,7 +2003,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setString(String propname, String value) { public void setString(String propname, String value) {
// nmgr.logEvent ("setting String prop"); // nmgr.logEvent ("setting String prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2095,7 +2101,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2108,7 +2114,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setInteger(String propname, long value) { public void setInteger(String propname, long value) {
// nmgr.logEvent ("setting bool prop"); // nmgr.logEvent ("setting bool prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2129,7 +2138,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2142,7 +2151,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setFloat(String propname, double value) { public void setFloat(String propname, double value) {
// nmgr.logEvent ("setting bool prop"); // nmgr.logEvent ("setting bool prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2163,7 +2175,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2176,7 +2188,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setBoolean(String propname, boolean value) { public void setBoolean(String propname, boolean value) {
// nmgr.logEvent ("setting bool prop"); // nmgr.logEvent ("setting bool prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2197,7 +2212,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2210,7 +2225,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setDate(String propname, Date value) { public void setDate(String propname, Date value) {
// nmgr.logEvent ("setting date prop"); // nmgr.logEvent ("setting date prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2231,7 +2249,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2244,7 +2262,10 @@ public final class Node implements INode, Serializable {
*/ */
public void setJavaObject(String propname, Object value) { public void setJavaObject(String propname, Object value) {
// nmgr.logEvent ("setting jobject prop"); // nmgr.logEvent ("setting jobject prop");
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (propMap == null) { if (propMap == null) {
propMap = new Hashtable(); propMap = new Hashtable();
@ -2265,7 +2286,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} }
@ -2439,7 +2460,10 @@ public final class Node implements INode, Serializable {
} }
if (p != null) { if (p != null) {
checkWriteLock(); boolean isPersistable = state != TRANSIENT && isPersistableProperty(propname);
if (isPersistable) {
checkWriteLock();
}
if (relational) { if (relational) {
p.setStringValue(null); p.setStringValue(null);
@ -2448,7 +2472,7 @@ public final class Node implements INode, Serializable {
lastmodified = System.currentTimeMillis(); lastmodified = System.currentTimeMillis();
if (state == CLEAN && isPersistableProperty(propname)) { if (state == CLEAN && isPersistable) {
markAs(MODIFIED); markAs(MODIFIED);
} }
} else if (dbmap != null) { } else if (dbmap != null) {