fix(gcs): Prevent NPE when gcs artifact account has no credentials pa…

…th (spinnaker#2324)
spinnakerbot · Jan 29, 2018 · b51cd35 · b51cd35
1 parent 9d77c8b
commit b51cd35
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java b/...src/main/java/com/netflix/spinnaker/clouddriver/artifacts/gcs/GcsArtifactCredentials.java
@@ -29,6 +29,7 @@
 import com.netflix.spinnaker.kork.artifacts.model.Artifact;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -50,7 +51,7 @@ public GcsArtifactCredentials(String applicationName, GcsArtifactAccount account
 
     GoogleCredential credential;
 
-    if (!credentialsPath.isEmpty()) {
+    if (!StringUtils.isEmpty(credentialsPath)) {
       FileInputStream stream = new FileInputStream(credentialsPath);
       credential = GoogleCredential.fromStream(stream, transport, jsonFactory)
           .createScoped(Collections.singleton(StorageScopes.DEVSTORAGE_READ_ONLY));