svn commit: r1813405 - in /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy: ForwardHandler.java NetworkErrorProxy.java

[fr...@apache.org]

Author: frm
Date: Thu Oct 26 14:15:19 2017
New Revision: 1813405

URL: http://svn.apache.org/viewvc?rev=1813405&view=rev
Log:
OAK-6829 - Throw an exception if a timeout occurs in NetworkErrorProxy 

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
    jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java?rev=1813405&r1=1813404&r2=1813405&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/ForwardHandler.java Thu Oct 26 14:15:19 2017
@@ -87,7 +87,7 @@ class ForwardHandler extends ChannelInbo
         if (f.awaitUninterruptibly(1, TimeUnit.SECONDS)) {
             log.debug("Connected to remote host");
         } else {
-            log.debug("Connection to remote host timed out");
+            throw new Exception("Connection to remote host timed out");
         }
         remote = f.channel();
     }

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java?rev=1813405&r1=1813404&r2=1813405&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/test/proxy/NetworkErrorProxy.java Thu Oct 26 14:15:19 2017
@@ -20,7 +20,6 @@
 package org.apache.jackrabbit.oak.segment.test.proxy;
 
 import java.io.Closeable;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -103,7 +102,7 @@ public class NetworkErrorProxy implement
         if (f.awaitUninterruptibly(1, TimeUnit.SECONDS)) {
             log.debug("Bound on port {}", inboundPort);
         } else {
-            log.debug("Binding on port {} timed out", inboundPort);
+            throw new Exception(String.format("Binding on port %d timed out", inboundPort));
         }
         server = f.channel();
     }
@@ -116,7 +115,7 @@ public class NetworkErrorProxy implement
             if (server.disconnect().awaitUninterruptibly(1, TimeUnit.SECONDS)) {
                 log.debug("Channel disconnected");
             } else {
-                log.debug("Channel disconnect timed out");
+                throw new Exception("Channel disconnect timed out");
             }
         }
         connect();