[*] import correction

finos · Feb 20, 2024 · cb71ba8 · cb71ba8
1 parent e901c54
commit cb71ba8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.../timebase/client/src/main/java/com/epam/deltix/qsrv/hf/tickdb/ui/tbshell/TickDBShell.java b/.../timebase/client/src/main/java/com/epam/deltix/qsrv/hf/tickdb/ui/tbshell/TickDBShell.java
@@ -407,21 +407,28 @@ public void send (InstrumentMessage msg) {
                 return false;
             }
 
+            DXTickStream stream = null;
+
             if (args == null) {
                 if (!dbmgr.checkSingleStream ())
                     return (true);
+                stream = dbmgr.getStreams()[0];
 
-                ImportExportHelper.filterMessageFile(srcMsgFile, dbmgr.getStreams()[0], selector, writeMode);
             } else if (args.length() > 0) {
-                DXTickStream stream = dbmgr.getStream(args);
+                stream = dbmgr.getStream(args);
                 if (stream == null)
                     stream = ImportExportHelper.createStream(dbmgr.getDB(), args, srcMsgFile);
+            }
 
-                if (srcMsgFile.getName().endsWith(".zip")) {
-                    ImportExportHelper.filterArchiveFile(srcMsgFile, stream, selector, writeMode);
-                } else {
-                    ImportExportHelper.filterMessageFile(srcMsgFile, stream, selector, writeMode);
-                }
+            if (stream == null) {
+                System.out.println("Source stream is not selected. Use `set stream <stream>` or 'import <stream>' ");
+                return false;
+            }
+
+            if (srcMsgFile.getName().endsWith(".zip")) {
+                ImportExportHelper.filterArchiveFile(srcMsgFile, stream, selector, writeMode);
+            } else {
+                ImportExportHelper.filterMessageFile(srcMsgFile, stream, selector, writeMode);
             }
 
             return (true);

diff --git a/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/util/tomcat/DXTomcat.java b/java/timebase/commons/src/main/java/com/epam/deltix/qsrv/util/tomcat/DXTomcat.java
@@ -72,7 +72,7 @@ public class DXTomcat extends Tomcat {
 
     private SSLProperties       sslConfig = null;
 
-    private Signal              stopSignal = new Signal();
+    private final Signal        stopSignal = new Signal();
 
     public DXTomcat() {
         this ((String) null);