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

Timestamp:

2017-02-26T02:13:15+01:00 (7 years ago)

Author:

Don-vip

Message:

see #3346 - findbugs - IS2_INCONSISTENT_SYNC

File:

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

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

@@ -61 +61 @@
  *
  * Dataset is threadsafe - accessing Dataset simultaneously from different threads should never
- * lead to data corruption or ConccurentModificationException. However when for example one thread
+ * lead to data corruption or ConcurrentModificationException. However when for example one thread
  * removes primitive and other thread try to add another primitive referring to the removed primitive,
  * DataIntegrityException will occur.
@@ -966 +966 @@
 
     @Override
-    public Collection<DataSource> getDataSources() {
+    public synchronized Collection<DataSource> getDataSources() {
         return Collections.unmodifiableCollection(dataSources);
     }
@@ -1383 +1383 @@
         if (from != null) {
             new DataSetMerger(this, from).merge(progressMonitor);
-            if (!from.dataSources.isEmpty()) {
-                if (dataSources.addAll(from.dataSources)) {
-                    cachedDataSourceArea = null;
-                    cachedDataSourceBounds = null;
+            synchronized (from) {
+                if (!from.dataSources.isEmpty()) {
+                    if (dataSources.addAll(from.dataSources)) {
+                        cachedDataSourceArea = null;
+                        cachedDataSourceBounds = null;
+                    }
+                    from.dataSources.clear();
+                    from.cachedDataSourceArea = null;
+                    from.cachedDataSourceBounds = null;
                 }
-                from.dataSources.clear();
-                from.cachedDataSourceArea = null;
-                from.cachedDataSourceBounds = null;
             }
         }
@@ -1403 +1405 @@
     }
 
-    public ProjectionBounds getDataSourceBoundingBox() {
+    /**
+     * Returns the data sources bounding box.
+     * @return the data sources bounding box
+     */
+    public synchronized ProjectionBounds getDataSourceBoundingBox() {
         BoundingXYVisitor bbox = new BoundingXYVisitor();
         for (DataSource source : dataSources) {
@@ -1413 +1419 @@
         return null;
     }
-
 }