From 40dcc8b34ad07054146921be438c7b9f5addd66d Mon Sep 17 00:00:00 2001
From: Matt Drees <matt.drees@cru.org>
Date: Tue, 24 Jul 2018 08:35:18 -0600
Subject: [PATCH] Move utility method to CommonUtils

---
 .../cas/client/session/SingleSignOutHandler.java      |  6 +-----
 .../java/org/jasig/cas/client/util/CommonUtils.java   | 11 +++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java
index ace2745..2023268 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java
@@ -189,11 +189,7 @@ public final class SingleSignOutHandler {
     }
 
     private String getPath(HttpServletRequest request) {
-        return request.getServletPath() + nullToEmpty(request.getPathInfo());
-    }
-
-    private String nullToEmpty(String string) {
-        return string == null ? "" : string;
+        return request.getServletPath() + CommonUtils.nullToEmpty(request.getPathInfo());
     }
 
     /**
diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
index 82c95d3..32ebb5c 100644
--- a/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
+++ b/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java
@@ -719,4 +719,15 @@ public final class CommonUtils {
         }
     }
 
+    /**
+     * Returns the string as-is, unless it's <code>null</code>;
+     * in this case an empty string is returned.
+     *
+     * @param string a possibly <code>null</code> string
+     * @return a non-<code>null</code> string
+     */
+    public static String nullToEmpty(String string) {
+        return string == null ? "" : string;
+    }
+
 }