Merge pull request #103 from dobbymoodge/JENKINS-40786

JENKINS-40786 - check constructor for null values
jenkinsci · Jan 11, 2017 · 5d17f47 · 5d17f47
2 parents 30e3d7b + 5ceaf17
commit 5d17f47
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/s3/S3BucketPublisher.java b/src/main/java/hudson/plugins/s3/S3BucketPublisher.java
@@ -69,10 +69,16 @@ public S3BucketPublisher(String profileName, List<Entry> entries, List<MetadataP
 
         this.dontWaitForConcurrentBuildCompletion = dontWaitForConcurrentBuildCompletion;
         this.consoleLogLevel = parseLevel(consoleLogLevel);
-        this.pluginFailureResultConstraint = Result.fromString(pluginFailureResultConstraint);
+        if (pluginFailureResultConstraint == null) {
+            this.pluginFailureResultConstraint = Result.FAILURE;
+        } else {
+            this.pluginFailureResultConstraint = Result.fromString(pluginFailureResultConstraint);
+        }
     }
 
     private Level parseLevel(String lvl) {
+        if (lvl == null)
+            lvl = "";
         switch (lvl) {
         case "WARNING": return Level.WARNING;
         case "SEVERE":  return Level.SEVERE;