From a439c0268f8f65aadbf84c6eb2a346bbc5a2d048 Mon Sep 17 00:00:00 2001
From: William Gautier <williamg@activestate.com>
Date: Thu, 30 Apr 2015 11:43:27 -0700
Subject: [PATCH] Add null check for credentials map

---
 .../CloudFoundryServiceInfoCreator.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
index ce8a834..141cea4 100644
--- a/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
+++ b/spring-cloud-cloudfoundry-connector/src/main/java/org/springframework/cloud/cloudfoundry/CloudFoundryServiceInfoCreator.java
@@ -90,19 +90,23 @@ public abstract class CloudFoundryServiceInfoCreator<SI extends ServiceInfo> imp
 	}
 
 	protected String getStringFromCredentials(Map<String, Object> credentials, String... keys) {
-		for (String key : keys) {
-			if (credentials.containsKey(key)) {
-				return (String) credentials.get(key);
+		if (credentials != null) {
+			for (String key : keys) {
+				if (credentials.containsKey(key)) {
+					return (String) credentials.get(key);
+				}
 			}
 		}
 		return null;
 	}
 
 	protected int getIntFromCredentials(Map<String, Object> credentials, String... keys) {
-		for (String key : keys) {
-			if (credentials.containsKey(key)) {
-				// allows the value to be quoted as a String or native integer type
-				return Integer.parseInt(credentials.get(key).toString());
+		if (credentials != null) {
+			for (String key : keys) {
+				if (credentials.containsKey(key)) {
+					// allows the value to be quoted as a String or native integer type
+					return Integer.parseInt(credentials.get(key).toString());
+				}
 			}
 		}
 		return -1;