Index: thirdparty/javacontentrepo/jackrabbit-1.6.0_idm1.1.1b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
===================================================================
diff -u -N -r86924 -r87020
--- thirdparty/javacontentrepo/jackrabbit-1.6.0_idm1.1.1b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (.../NodeState.java) (revision 86924)
+++ thirdparty/javacontentrepo/jackrabbit-1.6.0_idm1.1.1b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (.../NodeState.java) (revision 87020)
@@ -85,7 +85,7 @@
* Listener.
*/
private transient NodeStateListener listener;
-
+
/**
* Constructs a new node state that is initially connected to an overlayed
* state.
@@ -296,10 +296,8 @@
* @return the ChildNodeEntry with the specified name and index
* or null if there's no matching entry.
*/
- public ChildNodeEntry getChildNodeEntry(Name nodeName, int index) {
- synchronized (getLockObject()) {
- return childNodeEntries.get(nodeName, index);
- }
+ public synchronized ChildNodeEntry getChildNodeEntry(Name nodeName, int index) {
+ return childNodeEntries.get(nodeName, index);
}
/**
@@ -312,10 +310,8 @@
* @see #addChildNodeEntry
* @see #removeChildNodeEntry
*/
- public ChildNodeEntry getChildNodeEntry(NodeId id) {
- synchronized (getLockObject()) {
- return childNodeEntries.get(id);
- }
+ public synchronized ChildNodeEntry getChildNodeEntry(NodeId id) {
+ return childNodeEntries.get(id);
}
/**
@@ -326,10 +322,8 @@
* @see #addChildNodeEntry
* @see #removeChildNodeEntry
*/
- public List getChildNodeEntries() {
- synchronized (getLockObject()) {
- return childNodeEntries;
- }
+ public synchronized List getChildNodeEntries() {
+ return childNodeEntries;
}
/**