Close session on error

6 years ago · 85c754865e
1 changed files with 8 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@ -180,13 +180,20 @@ public final class EdgeGrpcSession implements Closeable {
            @Override
            public void onError(Throwable t) {
                log.error("Failed to deliver message from client!", t);
+                closeSession();
            }

            @Override
            public void onCompleted() {
+                closeSession();
+            }
+
+            private void closeSession() {
                connected = false;
                if (edge != null) {
-                    sessionCloseListener.accept(edge.getId());
+                    try {
+                        sessionCloseListener.accept(edge.getId());
+                    } catch (Exception ignored) {}
                }
                try {
                    outputStream.onCompleted();