fix: throw NullPointerException when InboxEntryStream.EntryStreamList…

…ener.onNextChunkRequest returns null during sending file (#4)
simplito · Dec 6, 2024 · 45aa509 · 45aa509
1 parent ed3bb00
commit 45aa509
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.../main/java/com/simplito/java/privmx_endpoint_extra/inboxEntryStream/InboxEntryStream.java b/.../main/java/com/simplito/java/privmx_endpoint_extra/inboxEntryStream/InboxEntryStream.java
@@ -128,7 +128,6 @@ public synchronized void sendFiles(
                 }
             }));
         });
-        System.out.println("Start waiting 2");
         for (Future<?> future : sendingFiles) {
             if (Thread.interrupted()) {
                 cancel();
@@ -140,8 +139,7 @@ public synchronized void sendFiles(
                 // catch when in async mode someone call cancel on result Future.
                 cancel();
                 return;
-            } catch (Exception e) {
-                System.out.println("Break waiting on other exception");
+            } catch (Exception ignore) {
             }
         }
         if (sendingFiles.stream().allMatch(Future::isDone)) {
@@ -173,7 +171,11 @@ public void onChunkProcessed(Long processedBytes) {
                 if (controller.isStopped()) {
                     break;
                 }
-                fileHandle.write(inboxHandle, entryStreamListener.onNextChunkRequest(fileInfo));
+                byte[] nextChunk = entryStreamListener.onNextChunkRequest(fileInfo);
+                if (nextChunk == null) {
+                    throw new NullPointerException("Data chunk cannot be null");
+                }
+                fileHandle.write(inboxHandle, nextChunk);
             }
         } else {
             fileHandle.writeStream(inboxHandle, fileInfo.fileStream, controller);