Merge pull request #798 from eclipse/issues/#787-workbench-url-path

Fix #787: CookieHandlers now check for empty context path string instead of null

Author: Jeen Broekstra

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/proxy/CookieHandler.java

@@ -60,7 +60,7 @@ protected String getCookie(final HttpServletRequest req, final HttpServletRespon
 
 	private void initCookie(final Cookie cookie, final HttpServletRequest req) {
 		final String context = req.getContextPath();
-		cookie.setPath(null == context ? "/" : context);
+		cookie.setPath(context.isEmpty() ? "/" : context);
 		if (maxAge != null) {
 			cookie.setMaxAge(Integer.parseInt(maxAge));
 		}

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/util/CookieHandler.java

@@ -58,7 +58,7 @@ private void addCookie(final WorkbenchRequest req, final HttpServletResponse res
 		LOGGER.info("name: {}\nvalue: {}", name, value);
 		LOGGER.info("un-encoded value: {}\n--", raw);
 		final Cookie cookie = new Cookie(name, value);
-		if (null == req.getContextPath()) {
+		if (req.getContextPath().isEmpty()) {
 			cookie.setPath("/");
 		}
 		else {
@@ -96,7 +96,7 @@ public void addTotalResultCountCookie(WorkbenchRequest req, HttpServletResponse
 
 	public void addCookie(WorkbenchRequest req, HttpServletResponse resp, String name, String value) {
 		final Cookie cookie = new Cookie(name, value);
-		if (null == req.getContextPath()) {
+		if (req.getContextPath().isEmpty()) {
 			cookie.setPath("/");
 		}
 		else {