fix destroy entity in the context of inflight retirements

myronkscott · myronkscott · commit ba979136054e · 2025-07-14T23:09:25.000-07:00
diff --git a/tc-server/src/main/java/com/tc/objectserver/handler/RetirementManager.java b/tc-server/src/main/java/com/tc/objectserver/handler/RetirementManager.java
@@ -62,7 +62,7 @@ public void registerServerMessage(EntityMessage msg) {
   }
   
   public boolean hasServerInflightMessages() {
-    return !this.inflightServerMessages.isEmpty();
+    return !this.inflightServerMessages.isEmpty() || !this.currentlyRunning.isEmpty() || !this.waitingForDeferredRegistration.isEmpty();
   }
   
   public boolean isMessageRunning(EntityMessage invokeMessage) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void registerServerMessage(EntityMessage msg) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public boolean hasServerInflightMessages() {`
`65`		`- return !this.inflightServerMessages.isEmpty();`
	`65`	`+ return !this.inflightServerMessages.isEmpty() \|\| !this.currentlyRunning.isEmpty() \|\| !this.waitingForDeferredRegistration.isEmpty();`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public boolean isMessageRunning(EntityMessage invokeMessage) {`