Merge remote-tracking branch 'origin/master'

# Conflicts: # drivers/src/main/java/io/reacted/drivers/channels/chroniclequeue/CQLocalDriver.java # drivers/src/main/java/io/reacted/drivers/channels/chroniclequeue/CQRemoteDriver.java # drivers/src/main/java/io/reacted/drivers/channels/chroniclequeue/CQSerializer.java
reacted-io · Apr 26, 2024 · f5d3c8d · f5d3c8d
2 parents f324090 + 09d958e
commit f5d3c8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/core/src/main/java/io/reacted/core/reactorsystem/ReActorSystem.java b/core/src/main/java/io/reacted/core/reactorsystem/ReActorSystem.java
@@ -248,10 +248,15 @@ public boolean isSystemDeadLetters(ReActorRef anyRef) {
      * @param args             Arguments for Sl4j
      */
     public void logError(String errorDescription, Serializable ...args) {
-        if (getSystemLogger().publish(getSystemSink(), new ReActedError(errorDescription, args))
-                             .isNotSent()) {
+        try {
+            if (getSystemLogger().publish(getSystemSink(), new ReActedError(errorDescription, args))
+                                 .isNotSent()) {
                 LOGGER.error("Unable to log error: {}", errorDescription);
                 LOGGER.error(errorDescription, (Object) args);
+            }
+        } catch (Exception anyException) {
+            LOGGER.error("CRITIC! Nested exception while logging an error! ", anyException);
+            LOGGER.error("Original error:", (Object[]) args);
         }
     }
 

diff --git a/drivers/src/main/java/io/reacted/drivers/channels/chroniclequeue/CQDeserializer.java b/drivers/src/main/java/io/reacted/drivers/channels/chroniclequeue/CQDeserializer.java
@@ -13,6 +13,7 @@
 import net.openhft.chronicle.wire.WireIn;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 @NonNullByDefault
 public class CQDeserializer implements Deserializer {