Merge pull request #4 from jglick/NPE-JENKINS-17248

[JENKINS-17248] Robustness against NPE
jenkinsci · Sep 7, 2013 · dff58df · dff58df · jglick · Oct 4, 2013
2 parents 2b4f1b3 + d919780
commit dff58df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java b/src/main/java/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin.java
@@ -16,6 +16,7 @@
 import hudson.security.Permission;
 import hudson.util.ChartUtil;
 import hudson.util.FormValidation;
+import java.io.File;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -98,6 +99,10 @@ public void load() throws IOException {
         super.load();
     }
 
+    public File getConfigXmlFile() {
+        return getConfigXml().getFile();
+    }
+
     /**
      * Hack allowing to either generate plugin informations (build stat configurations) OR
      * generate chart data for a given buildStatConfigId request parameter

diff --git a/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java b/src/main/java/hudson/plugins/global_build_stats/business/GlobalBuildStatsPluginSaver.java
@@ -10,6 +10,7 @@
 import hudson.plugins.global_build_stats.xstream.GlobalBuildStatsXStreamConverter;
 import hudson.security.Permission;
 import hudson.util.DaemonThreadFactory;
+import java.io.File;
 import org.kohsuke.stapler.export.Exported;
 
 import java.io.IOException;
@@ -98,6 +99,13 @@ public void reloadPlugin() {
             this.plugin.load();
         } catch (IOException e) {
             LOGGER.log(Level.SEVERE, e.getMessage(), e);
+        } catch (NullPointerException x) {
+            File f = plugin.getConfigXmlFile();
+            File bak = new File(f.getParentFile(), f.getName() + ".bak");
+            if (!f.renameTo(bak)) {
+                LOGGER.log(Level.WARNING, "failed to rename {0} to {1}", new Object[] {f, bak});
+            }
+            LOGGER.log(Level.WARNING, "JENKINS-17248 load failure; saving problematic file to " + bak, x);
         }
     }