JENKINS-33401 - Credentials Integration

null check on credentials lookup
jenkinsci · Sep 6, 2016 · 7c865b8 · 7c865b8
1 parent e31d3f6
commit 7c865b8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/liquibase/common/PropertiesAssembler.java b/src/main/java/org/jenkinsci/plugins/liquibase/common/PropertiesAssembler.java
@@ -66,8 +66,10 @@ protected static void assembleFromProjectConfiguration(AbstractLiquibaseBuilder
                             StandardUsernamePasswordCredentials.class, build,
                             Lists.<DomainRequirement>newArrayList());
 
-            addPropertyIfDefined(properties, LiquibaseProperty.USERNAME, credentialById.getUsername(), environment);
-            addPropertyIfDefined(properties, LiquibaseProperty.PASSWORD, credentialById.getPassword().getPlainText(), environment);
+            if (credentialById!=null) {
+                addPropertyIfDefined(properties, LiquibaseProperty.USERNAME, credentialById.getUsername(), environment);
+                addPropertyIfDefined(properties, LiquibaseProperty.PASSWORD, credentialById.getPassword().getPlainText(), environment);
+            }
         }