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 null; + * in this case an empty string is returned. + * + * @param string a possibly null string + * @return a non-null string + */ + public static String nullToEmpty(String string) { + return string == null ? "" : string; + } + }