Develop (#16)

Mindgamesnl · Duckelekuuk · github-actions[bot] · web-flow · commit fe03a35bee94 · 2024-03-06T01:00:16.000+01:00
* Updated version in readme, added mvn central badge, fix typo * Added multiply example * Optimized all imports * Log errors thrown by implementations (#8) * Version bump * Add JaCoCo badge * Bump jedis due to org.json cve * Update develop (#10) * Release (#9) * Updated version in readme, added mvn central badge, fix typo * Added multiply example * Optimized all imports * Log errors thrown by implementations (#8) * Version bump --------- Co-authored-by: Duckelekuuk <duckelekuuk@gmail.com> Co-authored-by: Duckelekuuk <Duckelekuuk@users.noreply.github.com> * Add JaCoCo badge --------- Co-authored-by: Duckelekuuk <duckelekuuk@gmail.com> Co-authored-by: Duckelekuuk <Duckelekuuk@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * Make redis ignore itself, if configured (#13) * Add JaCoCo badge * Gracefully handle deadends (#15) --------- Co-authored-by: Duckelekuuk <duckelekuuk@gmail.com> Co-authored-by: Duckelekuuk <Duckelekuuk@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
diff --git a/meteor-core/src/main/java/dev/pixelib/meteor/core/trackers/OutgoingInvocationTracker.java b/meteor-core/src/main/java/dev/pixelib/meteor/core/trackers/OutgoingInvocationTracker.java
@@ -50,18 +50,21 @@ public <T> T invokeRemoteMethod(InvocationDescriptor invocationDescriptor) throw
         }
     }
 
-    public void completeInvocation(InvocationResponse invocationResponse) {
+    public boolean completeInvocation(InvocationResponse invocationResponse) {
         // do we have a pending invocation for this invocation id?
         PendingInvocation<?> pendingInvocation = pendingInvocations.get(invocationResponse.getInvocationId());
         if (pendingInvocation == null) {
-            throw new IllegalStateException("No pending invocation found for invocation id " + invocationResponse.getInvocationId() + ". Data: " + invocationResponse.getResult());
-            //return;
+            // we cannot handle this invocation, so it must be handled in another listener
+            return false;
         }
 
         pendingInvocation.complete(invocationResponse.getResult());
 
         // remove the pending invocation from the map
         pendingInvocations.remove(invocationResponse.getInvocationId());
+
+        // invocation was successfully completed
+        return true;
     }
 
 }
diff --git a/meteor-core/src/main/java/dev/pixelib/meteor/core/transport/TransportHandler.java b/meteor-core/src/main/java/dev/pixelib/meteor/core/transport/TransportHandler.java
@@ -49,8 +49,7 @@ public TransportHandler(
 
     private boolean handleInvocationResponse(byte[] bytes) throws ClassNotFoundException {
         InvocationResponse invocationResponse = InvocationResponse.fromBytes(serializer, bytes);
-        outgoingInvocationTracker.completeInvocation(invocationResponse);
-        return true;
+        return outgoingInvocationTracker.completeInvocation(invocationResponse);
     }
 
     private boolean handleInvocationRequest(byte[] bytes) throws ClassNotFoundException {

Original file line number	Diff line number	Diff line change
`@@ -50,18 +50,21 @@ public <T> T invokeRemoteMethod(InvocationDescriptor invocationDescriptor) throw`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- public void completeInvocation(InvocationResponse invocationResponse) {`
	`53`	`+ public boolean completeInvocation(InvocationResponse invocationResponse) {`
`54`	`54`	`// do we have a pending invocation for this invocation id?`
`55`	`55`	`PendingInvocation<?> pendingInvocation = pendingInvocations.get(invocationResponse.getInvocationId());`
`56`	`56`	`if (pendingInvocation == null) {`
`57`		`- throw new IllegalStateException("No pending invocation found for invocation id " + invocationResponse.getInvocationId() + ". Data: " + invocationResponse.getResult());`
`58`		`- //return;`
	`57`	`+ // we cannot handle this invocation, so it must be handled in another listener`
	`58`	`+ return false;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`pendingInvocation.complete(invocationResponse.getResult());`
`62`	`62`
`63`	`63`	`// remove the pending invocation from the map`
`64`	`64`	`pendingInvocations.remove(invocationResponse.getInvocationId());`
	`65`	`+`
	`66`	`+ // invocation was successfully completed`
	`67`	`+ return true;`
`65`	`68`	`}`
`66`	`69`
`67`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ public TransportHandler(`
`49`	`49`
`50`	`50`	`private boolean handleInvocationResponse(byte[] bytes) throws ClassNotFoundException {`
`51`	`51`	`InvocationResponse invocationResponse = InvocationResponse.fromBytes(serializer, bytes);`
`52`		`- outgoingInvocationTracker.completeInvocation(invocationResponse);`
`53`		`- return true;`
	`52`	`+ return outgoingInvocationTracker.completeInvocation(invocationResponse);`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`private boolean handleInvocationRequest(byte[] bytes) throws ClassNotFoundException {`