Merge pull request #515 from project-tsurugi/amend

address corner cases in blob/clob processing
project-tsurugi · Jan 30, 2025 · ab2cdd9 · ab2cdd9
2 parents cc7b9db + 87a1550
commit ab2cdd9
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/...ain/java/com/tsurugidb/tsubakuro/channel/common/connection/wire/impl/ChannelResponse.java b/...ain/java/com/tsurugidb/tsubakuro/channel/common/connection/wire/impl/ChannelResponse.java
@@ -157,9 +157,13 @@ public InputStream openSubResponse(String id) throws NoSuchElementException, IOE
             waitForResultSetOrMainResponse();
             return relationChannel();
         } else {
-            var path = blobs.get(id).getLeft();
-            if (path != null) {
-                return new FileInputStream(path);
+            waitForMainResponse();
+            var entry = blobs.get(id);
+            if (entry != null) {
+                var path = entry.getLeft();
+                if (path != null) {
+                    return new FileInputStream(path);
+                }
             }
         }
         throw new NoSuchElementException("illegal SubResponse id");
@@ -174,9 +178,13 @@ public InputStream openSubResponse(String id, long timeout, TimeUnit unit) throw
             waitForResultSetOrMainResponse(timeout, unit);
             return relationChannel();
         } else {
-            var path = blobs.get(id).getLeft();
-            if (path != null) {
-                return new FileInputStream(path);
+            waitForMainResponse(timeout, unit);
+            var entry = blobs.get(id);
+            if (entry != null) {
+                var path = entry.getLeft();
+                if (path != null) {
+                    return new FileInputStream(path);
+                }
             }
         }
         throw new NoSuchElementException("illegal SubResponse id");