From 8202acdbc17add8cbb39cabfcd16ac1a616493eb Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Fri, 16 Aug 2013 10:51:25 -0700
Subject: [PATCH] CLOUDSTACK-3274: guard a null string case in case of string
 match.

---
 utils/src/com/cloud/utils/StringUtils.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/src/com/cloud/utils/StringUtils.java b/utils/src/com/cloud/utils/StringUtils.java
index 21c7220259e..c02082cca42 100644
--- a/utils/src/com/cloud/utils/StringUtils.java
+++ b/utils/src/com/cloud/utils/StringUtils.java
@@ -153,8 +153,10 @@ public class StringUtils {
     // Responsible for stripping sensitive content from request and response strings
     public static String cleanString(String stringToClean){
         String cleanResult = "";
-        cleanResult = REGEX_PASSWORD_QUERYSTRING.matcher(stringToClean).replaceAll("");
-        cleanResult = REGEX_PASSWORD_JSON.matcher(cleanResult).replaceAll("");
+        if (stringToClean != null) {
+            cleanResult = REGEX_PASSWORD_QUERYSTRING.matcher(stringToClean).replaceAll("");
+            cleanResult = REGEX_PASSWORD_JSON.matcher(cleanResult).replaceAll("");
+        }
         return cleanResult;
     }