Merge branch 'IGNITE-23114' into IGNITE-23114-sonar

skorotkov · Oct 3, 2024 · e6992ff · e6992ff
2 parents fa4da27 + 5f31d41
commit e6992ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/lob/JdbcBlobMemoryStorage.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/lob/JdbcBlobMemoryStorage.java
@@ -90,7 +90,7 @@ class JdbcBlobMemoryStorage implements JdbcBlobStorage {
 
         int remaining = cnt;
 
-        while (remaining > 0 && pos.getPos() < totalCnt) {
+        while (remaining > 0 && pos.getPos() < totalCnt && buf != null) {
             int toCopy = Math.min(remaining, buf.length - getBufPos(pos));
 
             if (toCopy > totalCnt - pos.getPos())

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/lob/JdbcBlobTmpFileStorage.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/lob/JdbcBlobTmpFileStorage.java
@@ -71,7 +71,7 @@ class JdbcBlobTmpFileStorage implements JdbcBlobStorage {
         try (OutputStream diskOutputStream = Files.newOutputStream(tempFile.toPath())) {
             stream.transferTo(diskOutputStream);
         }
-        catch (RuntimeException | Error e) {
+        catch (Exception e) {
             fileCleaner.clean();
 
             throw e;