svn commit: r1652035 - /jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java

[al...@apache.org]

Author: alexparvulescu
Date: Thu Jan 15 10:37:48 2015
New Revision: 1652035

URL: http://svn.apache.org/r1652035
Log:
OAK-2372 TARMK Cold Standby improve test cases for FSDS mirroring
 - improved logging on proxy

Modified:
    jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java

Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java?rev=1652035&r1=1652034&r2=1652035&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java Thu Jan 15 10:37:48 2015
@@ -20,13 +20,13 @@ package org.apache.jackrabbit.oak.plugin
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,11 +76,16 @@ public class NetworkErrorProxy {
 
             f = b.bind(this.inboundPort).sync();
         } catch (Exception e) {
-            log.warn("exception occurred", e);
+            log.warn(
+                    "Unable to start proxy on port " + inboundPort + ": "
+                            + e.getMessage(), e);
         }
     }
 
     public void reset() throws Exception {
+        if (f == null) {
+            throw new Exception("proxy not started");
+        }
         f.channel().disconnect();
         this.fh = new ForwardHandler(NetworkErrorProxy.this.host, NetworkErrorProxy.this.outboundPort);
         run();