Changeset 14169 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2018-08-19T23:48:04+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #16575 - make sure download/upload policies are never null and set to normal by default

File:

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

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

@@ -134 +134 @@
 
     private String name;
-    private DownloadPolicy downloadPolicy;
-    private UploadPolicy uploadPolicy;
+    private DownloadPolicy downloadPolicy = DownloadPolicy.NORMAL;
+    private UploadPolicy uploadPolicy = UploadPolicy.NORMAL;
     /** Flag used to know if the dataset should not be editable */
     private final AtomicBoolean isReadOnly = new AtomicBoolean(false);
@@ -329 +329 @@
     @Override
     public void setDownloadPolicy(DownloadPolicy downloadPolicy) {
-        this.downloadPolicy = downloadPolicy;
+        this.downloadPolicy = Objects.requireNonNull(downloadPolicy);
     }
 
@@ -339 +339 @@
     @Override
     public void setUploadPolicy(UploadPolicy uploadPolicy) {
-        this.uploadPolicy = uploadPolicy;
+        this.uploadPolicy = Objects.requireNonNull(uploadPolicy);
     }