Changeset 14003 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-07-06T00:51:36+02:00 (7 years ago)

Author:

Don-vip

Message:

attempt to fix frequent errors of DrawActionTest.testTicket12011`: fix NPE seen when running the test manually

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (3 diffs)
• data/osm/OsmPrimitive.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -854 +854 @@
      * mouseReleased() (FIXME).
      */
-    private void computeHelperLine() {
+    private synchronized void computeHelperLine() {
         if (mousePos == null) {
             // Don't draw the line.
@@ -931 +931 @@
      * uses also lastUsedNode field
      */
-    private void determineCurrentBaseNodeAndPreviousNode(Collection<OsmPrimitive> selection) {
+    private synchronized void determineCurrentBaseNodeAndPreviousNode(Collection<OsmPrimitive> selection) {
         Node selectedNode = null;
         Way selectedWay = null;
@@ -1041 +1041 @@
      * @return the current base node (can be null). If not-null, it's guaranteed the node is usable
      */
-    public Node getCurrentBaseNode() {
+    public synchronized Node getCurrentBaseNode() {
         if (currentBaseNode != null && (currentBaseNode.getDataSet() == null || !currentBaseNode.isUsable())) {
             currentBaseNode = null;

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

@@ -265 +265 @@
 
     protected void writeUnlock(boolean locked) {
-        if (locked) {
+        if (locked && dataSet != null) {
             // It shouldn't be possible for dataset to become null because
             // method calling setDataset would need write lock which is owned by this thread