Commit b85f9eefab7d2b3816437c15d0252ff7c41039a2
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
Showing
1 changed file
with
8 additions
and
1 deletions
| @@ -185,13 +185,20 @@ public final class EdgeGrpcSession implements Closeable { | @@ -185,13 +185,20 @@ public final class EdgeGrpcSession implements Closeable { | ||
| 185 | @Override | 185 | @Override |
| 186 | public void onError(Throwable t) { | 186 | public void onError(Throwable t) { |
| 187 | log.error("Failed to deliver message from client!", t); | 187 | log.error("Failed to deliver message from client!", t); |
| 188 | + closeSession(); | ||
| 188 | } | 189 | } |
| 189 | 190 | ||
| 190 | @Override | 191 | @Override |
| 191 | public void onCompleted() { | 192 | public void onCompleted() { |
| 193 | + closeSession(); | ||
| 194 | + } | ||
| 195 | + | ||
| 196 | + private void closeSession() { | ||
| 192 | connected = false; | 197 | connected = false; |
| 193 | if (edge != null) { | 198 | if (edge != null) { |
| 194 | - sessionCloseListener.accept(edge.getId()); | 199 | + try { |
| 200 | + sessionCloseListener.accept(edge.getId()); | ||
| 201 | + } catch (Exception ignored) {} | ||
| 195 | } | 202 | } |
| 196 | try { | 203 | try { |
| 197 | outputStream.onCompleted(); | 204 | outputStream.onCompleted(); |