Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Handle exceptions in AbstractNettyIoClient message handlers and made JSON parser more lenient for "NaN" literals

Rich Turnerbeed7a1a14af
diff --git a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
index 742132297..9aa32a04b 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/io/AbstractNettyIoClient.java
@@ -403,7 +403,14 @@ public abstract class AbstractNettyIoClient<T, U extends SocketAddress> implemen
}
LOG.finest("Message received notifying consumers: " + getClientUri());
- messageConsumers.forEach(consumer -> consumer.accept(message));
+ messageConsumers.forEach(consumer -> {
+ try {
+ consumer.accept(message);
+ } catch (Exception e) {
+ LOG.log(Level.SEVERE, "Exception occurred in message handler: " + getClientUri(), e);
+ onConnectionStatusChanged(ConnectionStatus.ERROR);
+ }
+ });
}
protected void onDecodeException(ChannelHandlerContext ctx, Throwable cause) {
diff --git a/model/src/main/java/org/openremote/model/value/impl/ValueTokenizer.java b/model/src/main/java/org/openremote/model/value/impl/ValueTokenizer.java
index b2b7b3100..1fc013a8e 100644
--- a/model/src/main/java/org/openremote/model/value/impl/ValueTokenizer.java
+++ b/model/src/main/java/org/openremote/model/value/impl/ValueTokenizer.java
@@ -291,6 +291,11 @@ class ValueTokenizer {
return valueFactory.create(false);
}
+ // Be tolerant of bad JSON with NaN
+ if ("NaN".equalsIgnoreCase(literal)) {
+ return null;
+ }
+
final char c = literal.charAt(0);
if (c == '-' || Character.isDigit(c)) {
return getNumberForLiteral(literal);