diff --git a/build.xml b/build.xml index 0aca9a9dba..2523546298 100644 --- a/build.xml +++ b/build.xml @@ -39,7 +39,9 @@ - + + + @@ -59,10 +61,6 @@ - - - - @@ -87,6 +85,10 @@ + + + + - - - - - - + + + + @@ -342,23 +343,19 @@ Build-Date: ${build.tstamp} - - - - + - - - - - - + + + + @@ -372,18 +369,7 @@ Build-Date: ${build.tstamp} - - - - - - - - - - - - + diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java index aabf50b337..7e103ac4cd 100644 --- a/src/org/openstreetmap/josm/data/osm/DataSet.java +++ b/src/org/openstreetmap/josm/data/osm/DataSet.java @@ -956,8 +956,8 @@ public void endUpdate() { if (!eventsToFire.isEmpty()) { lock.readLock().lock(); - lock.writeLock().unlock(); try { + lock.writeLock().unlock(); if (eventsToFire.size() < MAX_SINGLE_EVENTS) { for (AbstractDatasetChangedEvent event : eventsToFire) { fireEventToListeners(event); diff --git a/tools/error_prone_ant.jar b/tools/error_prone_core.jar similarity index 57% rename from tools/error_prone_ant.jar rename to tools/error_prone_core.jar index 4b6d68435c..0c3900b088 100644 Binary files a/tools/error_prone_ant.jar and b/tools/error_prone_core.jar differ diff --git a/tools/error_prone_javac.jar b/tools/error_prone_javac.jar new file mode 100644 index 0000000000..168633db13 Binary files /dev/null and b/tools/error_prone_javac.jar differ