Changeset 3348 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

2010-06-27T17:07:49+02:00 (14 years ago)

Author:

jttt

Message:

Thread safe Dataset and OsmPrimitive, read/write lock for dataset

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -20 +20 @@
         if(coor != null){
             if (getDataSet() != null) {
-                getDataSet().fireNodeMoved(this, coor);
+                boolean locked = writeLock();
+                try {
+                    getDataSet().fireNodeMoved(this, coor);
+                } finally {
+                    writeUnlock(locked);
+                }
             } else {
                 setCoorInternal(coor);
@@ -115 +120 @@
 
     @Override public void cloneFrom(OsmPrimitive osm) {
-        super.cloneFrom(osm);
-        setCoor(((Node)osm).coor);
+        boolean locked = writeLock();
+        try {
+            super.cloneFrom(osm);
+            setCoor(((Node)osm).coor);
+        } finally {
+            writeUnlock(locked);
+        }
     }
 
@@ -132 +142 @@
     @Override
     public void mergeFrom(OsmPrimitive other) {
-        super.mergeFrom(other);
-        if (!other.isIncomplete()) {
-            setCoor(new LatLon(((Node)other).coor));
+        boolean locked = writeLock();
+        try {
+            super.mergeFrom(other);
+            if (!other.isIncomplete()) {
+                setCoor(new LatLon(((Node)other).coor));
+            }
+        } finally {
+            writeUnlock(locked);
         }
     }
 
     @Override public void load(PrimitiveData data) {
-        super.load(data);
-        setCoor(((NodeData)data).getCoor());
+        boolean locked = writeLock();
+        try {
+            super.load(data);
+            setCoor(((NodeData)data).getCoor());
+        } finally {
+            writeUnlock(locked);
+        }
     }