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

* Make markAs(), setState() and getState() unsynchronized again,

Browse source 
and make state field volatile instead, in order to prevent deadlocks.
This commit is contained in:
hns 2006-04-26 13:23:36 +00:00
parent 1611d75c3c
commit ae6d3738d2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ public final class Node implements INode, Serializable {
transient long lastSubnodeCount = 0; // these two are only used transient long lastSubnodeCount = 0; // these two are only used
transient int subnodeCount = -1; // for aggressive loading relational subnodes transient int subnodeCount = -1; // for aggressive loading relational subnodes
transient private volatile Transactor lock; transient private volatile Transactor lock;
transient private int state; transient private volatile int state;
/** /**
* Creates an empty, uninitialized Node. The init() method must be called on the * Creates an empty, uninitialized Node. The init() method must be called on the
@ -296,7 +296,7 @@ public final class Node implements INode, Serializable {
/** /**
* Set this node's state, registering it with the transactor if necessary. * Set this node's state, registering it with the transactor if necessary.
*/ */
synchronized void markAs(int s) { void markAs(int s) {
if (s == state || state == INVALID || state == VIRTUAL || state == TRANSIENT) { if (s == state || state == INVALID || state == VIRTUAL || state == TRANSIENT) {
return; return;
} }
@ -372,7 +372,7 @@ public final class Node implements INode, Serializable {
* *
* @return this node's state * @return this node's state
*/ */
public synchronized int getState() { public int getState() {
return state; return state;
} }
@ -381,8 +381,8 @@ public final class Node implements INode, Serializable {
* *
* @param s this node's new state * @param s this node's new state
*/ */
public synchronized void setState(int s) { public void setState(int s) {
this.state = s; state = s;
} }
/** /**
@ -428,7 +428,6 @@ public final class Node implements INode, Serializable {
if ((state == TRANSIENT) && (id == null)) { if ((state == TRANSIENT) && (id == null)) {
id = TransientNode.generateID(); id = TransientNode.generateID();
} }
return id; return id;
} }
@ -1669,9 +1668,11 @@ public final class Node implements INode, Serializable {
return subnodes; return subnodes;
} }
/**
* Return true if a change in subnodes can be ignored because it is
* stored in the subnodes themselves.
*/
private boolean ignoreSubnodeChange() { private boolean ignoreSubnodeChange() {
// return true if a change in subnodes can be ignored because it is
// stored in the subnodes themselves.
Relation rel = (dbmap == null) ? null : dbmap.getSubnodeRelation(); Relation rel = (dbmap == null) ? null : dbmap.getSubnodeRelation();
return ((rel != null) && (rel.otherType != null) && rel.otherType.isRelational()); return ((rel != null) && (rel.otherType != null) && rel.otherType.isRelational());
@ -2027,7 +2028,6 @@ public final class Node implements INode, Serializable {
if (subrel.order != null && subrel.order.indexOf(dbcolumn) > -1) { if (subrel.order != null && subrel.order.indexOf(dbcolumn) > -1) {
parent.registerSubnodeChange(); parent.registerSubnodeChange();
} }
// check if accessname has changed // check if accessname has changed
if (subrel.accessName != null && if (subrel.accessName != null &&
subrel.accessName.equals(dbcolumn)) { subrel.accessName.equals(dbcolumn)) {