From 05409ff12a1ab7038af21b3bcfe66a272d3ac5a4 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Thu, 30 Apr 2020 16:12:31 +0300
Subject: [PATCH] Data transfer servlet fix

---
 .../data/transfer/impl/WebDataTransferServlet.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
index eb4de40aa6..23d23b3567 100644
--- a/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
+++ b/server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/impl/WebDataTransferServlet.java
@@ -34,12 +34,15 @@ public class WebDataTransferServlet extends HttpServlet {
 
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        String dataFileId = request.getPathInfo();
-        while (dataFileId.startsWith("/")) {
-            dataFileId = dataFileId.substring(1);
-        }
-
         try {
+            String dataFileId = request.getPathInfo();
+            if (CommonUtils.isEmpty(dataFileId)) {
+                throw new DBWebException("Data ID not specified");
+            }
+            while (dataFileId.startsWith("/")) {
+                dataFileId = dataFileId.substring(1);
+            }
+
             WebSession webSession = CBPlatform.getInstance().getSessionManager().tryGetWebSession(request.getSession());
             if (webSession == null) {
                 throw new DBWebException("No active session");