Merge pull request #53 from ravinperera00/java21_sync

Improve callMethod logic
ballerina-platform · Nov 27, 2024 · 2616ee8 · 2616ee8
2 parents 6f622ca + 51e74ce
commit 2616ee8
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/native/src/main/java/io/ballerina/lib/data/xmldata/io/BallerinaByteBlockInputStream.java b/native/src/main/java/io/ballerina/lib/data/xmldata/io/BallerinaByteBlockInputStream.java
@@ -82,35 +82,40 @@ public int read() {
     @Override
     public void close() throws IOException {
         super.close();
-        if (closeMethod != null) {
-            env.getRuntime().callMethod(iterator, closeMethod.getName(), null);
-        }
+        env.yieldAndRun(() -> {
+            if (closeMethod != null) {
+                    env.getRuntime().callMethod(iterator, closeMethod.getName(), null);
+            }
+            return null;
+        });
     }
 
     private boolean hasBytesInCurrentChunk() {
         return currentChunk.length != 0 && nextChunkIndex < currentChunk.length;
     }
 
     private boolean readNextChunk() throws InterruptedException {
-        try {
-            Object result = env.getRuntime().callMethod(iterator, nextMethodName, null);
-            if (result == null) {
+        return env.yieldAndRun(() -> {
+            try {
+                Object result = env.getRuntime().callMethod(iterator, nextMethodName, null);
+                if (result == null) {
+                    done.set(true);
+                    return !done.get();
+                }
+                if (result instanceof BMap<?, ?>) {
+                    BMap<BString, Object> valueRecord = (BMap<BString, Object>) result;
+                    final BString value = Arrays.stream(valueRecord.getKeys()).findFirst().get();
+                    final BArray arrayValue = valueRecord.getArrayValue(value);
+                    currentChunk = arrayValue.getByteArray();
+                } else {
+                    done.set(true);
+                }
+            } catch (BError bError) {
                 done.set(true);
-                return true;
+                currentChunk = new byte[0];
             }
-            if (result instanceof BMap<?, ?>) {
-                BMap<BString, Object> valueRecord = (BMap<BString, Object>) result;
-                final BString value = Arrays.stream(valueRecord.getKeys()).findFirst().get();
-                final BArray arrayValue = valueRecord.getArrayValue(value);
-                currentChunk = arrayValue.getByteArray();
-            } else {
-                done.set(true);
-            }
-        } catch (BError bError) {
-            done.set(true);
-            currentChunk = new byte[0];
-        }
-        return !done.get();
+            return !done.get();
+        });
     }
 
     public BError getError() {