You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by fr...@apache.org on 2017/10/27 12:17:27 UTC

svn commit: r1813518 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby: client/ExceptionHandler.java server/ExceptionHandler.java

Author: frm
Date: Fri Oct 27 12:17:27 2017
New Revision: 1813518

URL: http://svn.apache.org/viewvc?rev=1813518&view=rev
Log:
OAK-6829 - Let the primary and the standby close the connection if an exception is caught

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/ExceptionHandler.java
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/ExceptionHandler.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/ExceptionHandler.java?rev=1813518&r1=1813517&r2=1813518&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/ExceptionHandler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/ExceptionHandler.java Fri Oct 27 12:17:27 2017
@@ -28,13 +28,14 @@ class ExceptionHandler extends ChannelIn
 
     private final String clientId;
 
-    public ExceptionHandler(String clientId) {
+    ExceptionHandler(String clientId) {
         this.clientId = clientId;
     }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         log.warn(String.format("Exception caught on client %s", clientId), cause);
+        ctx.close();
     }
 
 }

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/ExceptionHandler.java?rev=1813518&r1=1813517&r2=1813518&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/ExceptionHandler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/ExceptionHandler.java Fri Oct 27 12:17:27 2017
@@ -29,6 +29,7 @@ class ExceptionHandler extends ChannelIn
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         log.warn("Exception caught on the server", cause);
+        ctx.close();
     }
 
 }