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 al...@apache.org on 2015/08/14 09:39:39 UTC
svn commit: r1695830 - in /jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client: StandbyClient.java StandbyClientHandler.java

Author: alexparvulescu
Date: Fri Aug 14 07:39:38 2015
New Revision: 1695830

URL: http://svn.apache.org/r1695830
Log:
OAK-3109 OOME in tarkmk standby tests
 - minor leftover cleanup

Modified:
    jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
    jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java

Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java?rev=1695830&r1=1695829&r2=1695830&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Fri Aug 14 07:39:38 2015
@@ -153,8 +153,8 @@ public final class StandbyClient impleme
             }
             state = STATUS_STARTING;
             executor = new DefaultEventExecutorGroup(4);
-            handler = new StandbyClientHandler(this.store, executor, observer,
-                    running, readTimeoutMs, autoClean);
+            handler = new StandbyClientHandler(this.store, observer, running,
+                    readTimeoutMs, autoClean);
             group = new NioEventLoopGroup();
 
             b = new Bootstrap();

Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java?rev=1695830&r1=1695829&r2=1695830&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java Fri Aug 14 07:39:38 2015
@@ -44,7 +44,6 @@ public class StandbyClientHandler extend
             .getLogger(StandbyClientHandler.class);
 
     private final StandbyStore store;
-    private final EventExecutorGroup executor;
     private final CommunicationObserver observer;
     private final AtomicBoolean running;
     private final int readTimeoutMs;
@@ -54,10 +53,9 @@ public class StandbyClientHandler extend
     private ChannelHandlerContext ctx;
 
     public StandbyClientHandler(final StandbyStore store,
-            EventExecutorGroup executor, CommunicationObserver observer,
-            AtomicBoolean running, int readTimeoutMs, boolean autoClean) {
+            CommunicationObserver observer, AtomicBoolean running,
+            int readTimeoutMs, boolean autoClean) {
         this.store = store;
-        this.executor = executor;
         this.observer = observer;
         this.running = running;
         this.readTimeoutMs = readTimeoutMs;