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

Timestamp:

2018-02-18T21:33:30+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15969 - upload broken (regression from r13434)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/UploadPrimitivesTask.java (modified) (1 diff)
• io/DiffResultProcessor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -220 +220 @@
         // partially uploaded. Better run on EDT.
         Runnable r = () -> {
-            layer.cleanupAfterUpload(processedPrimitives);
-            layer.onPostUploadToServer();
-            ChangesetCache.getInstance().update(changeset);
+            boolean readOnly = layer.isReadOnly();
+            if (readOnly) {
+                layer.unsetReadOnly();
+            }
+            try {
+                layer.cleanupAfterUpload(processedPrimitives);
+                layer.onPostUploadToServer();
+                ChangesetCache.getInstance().update(changeset);
+            } finally {
+                if (readOnly) {
+                    layer.setReadOnly();
+                }
+            }
         };
 

trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

@@ -121 +121 @@
             ds = primitives.iterator().next().getDataSet();
         }
+        boolean readOnly = false;
         if (ds != null) {
+            readOnly = ds.isReadOnly();
+            if (readOnly) {
+                ds.unsetReadOnly();
+            }
             ds.beginUpdate();
         }
@@ -152 +157 @@
             if (ds != null) {
                 ds.endUpdate();
+                if (readOnly) {
+                    ds.setReadOnly();
+                }
             }
             monitor.finishTask();