[JENKINS-30662] - Proper initialization of UserContextCache on jenkin…

…s startup
jenkinsci · Sep 27, 2015 · 77c2370 · 77c2370
1 parent 3f17a45
commit 77c2370
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/com/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView.java b/src/main/java/com/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView.java
@@ -66,15 +66,25 @@ public class SimpleSearchView extends ListView {
      * @since 0.2.1
      */
     public static final VersionNumber MINIMAL_AUTOREFRESH_VERSION = new VersionNumber("1.557");
-    transient final UserContextCache contextMap = new UserContextCache();
+
+    @Nonnull
+    transient UserContextCache contextMap;
 
     private String defaultIncludeRegex;
     private DescribableList<ViewJobFilter, Descriptor<ViewJobFilter>> defaultJobFilters;
 
     @DataBoundConstructor
     public SimpleSearchView(String name) {
         super(name);
+        this.contextMap = new UserContextCache();
     } 
+
+    protected Object readResolve() {
+        if (contextMap == null) {
+            contextMap = new UserContextCache();
+        }
+        return this;
+    }
 
     public String getDefaultIncludeRegex() {
         return defaultIncludeRegex;