[JENKINS-21044] - Don't create a new HashMap after the load operation

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
jenkinsci · Feb 24, 2014 · c453516 · c453516
1 parent 9b7562d
commit c453516
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleJobProperty.java b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleJobProperty.java
@@ -174,9 +174,12 @@ public DescriptorImpl() {
             super(ThrottleJobProperty.class);
             synchronized(propertiesByCategoryLock) {
                 load();
-                // Explictly drop queue items loaded from 1.8.1 version
-                if (!propertiesByCategory.isEmpty()) {
+                // Explictly handle the persisted data from the version 1.8.1
+                if (propertiesByCategory == null) {
                     propertiesByCategory = new HashMap<String,Map<ThrottleJobProperty,Void>>();
+                }
+                if (!propertiesByCategory.isEmpty()) {
+                    propertiesByCategory.clear();
                     save(); // Save the configuration to remove obsolete data
                 }
             }