From 6d88719ac455e92bb2f26ea246fcd83f6db39186 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 29 Jun 2022 12:53:05 +0200
Subject: [PATCH] CB-2180 Cookie determine fix + DS loading fix

---
 .../src/io/cloudbeaver/utils/WebAppUtils.java                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
index 45edfeb74c..f85a847352 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
@@ -145,11 +145,12 @@ public class WebAppUtils {
     }
 
     public static String getRequestCookie(HttpServletRequest request, String cookieName) {
+        String value = null;
         for (Cookie cookie : request.getCookies()) {
             if (cookie.getName().equals(cookieName)) {
-                return cookie.getValue();
+                value = cookie.getValue();
             }
         }
-        return null;
+        return value;
     }
 }