use last JSESSIONID

Leemoonsoo · Leemoonsoo · commit 70915a2069d2 · 2017-05-17T15:19:07.000-04:00
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -429,13 +429,19 @@ private static String getCookie(String user, String password) throws IOException
     LOG.info("{} - {}", postMethod.getStatusCode(), postMethod.getStatusText());
     Pattern pattern = Pattern.compile("JSESSIONID=([a-zA-Z0-9-]*)");
     Header[] setCookieHeaders = postMethod.getResponseHeaders("Set-Cookie");
+    String jsessionId = null;
     for (Header setCookie : setCookieHeaders) {
       java.util.regex.Matcher matcher = pattern.matcher(setCookie.toString());
       if (matcher.find()) {
-        return matcher.group(1);
+        jsessionId = matcher.group(1);
       }
     }
-    return StringUtils.EMPTY;
+
+    if (jsessionId != null) {
+      return jsessionId;
+    } else {
+      return StringUtils.EMPTY;
+    }
   }
 
   protected static boolean userAndPasswordAreNotBlank(String user, String pwd) {
