[FIXED JENKINS-24358] RunSaveableReference.get can acquire locks, so …

…avoid calling it while holding a lock on ourselves. (cherry picked from commit 5fea6cb) Conflicts: changelog.html
jenkinsci · Sep 7, 2014 · efbdd4d · efbdd4d
1 parent 8d81020
commit efbdd4d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -84,9 +84,13 @@ public boolean isActivated() {
         return !data.isEmpty();
     }
 
-    public synchronized Map<Saveable,VersionRange> getData() {
+    public Map<Saveable,VersionRange> getData() {
+        Map<SaveableReference,VersionRange> _data;
+        synchronized (this) {
+            _data = new HashMap<SaveableReference,VersionRange>(this.data);
+        }
         Map<Saveable,VersionRange> r = new HashMap<Saveable,VersionRange>();
-        for (Map.Entry<SaveableReference,VersionRange> entry : data.entrySet()) {
+        for (Map.Entry<SaveableReference,VersionRange> entry : _data.entrySet()) {
             Saveable s = entry.getKey().get();
             if (s != null) {
                 r.put(s, entry.getValue());