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 2016/04/12 12:10:14 UTC
svn commit: r1738753 -
/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
Author: frm
Date: Tue Apr 12 10:10:14 2016
New Revision: 1738753
URL: http://svn.apache.org/viewvc?rev=1738753&view=rev
Log:
OAK-4110 - Sync on the future returned when the channel of the proxy is closed
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=1738753&r1=1738752&r2=1738753&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 Tue Apr 12 10:10:14 2016
@@ -93,7 +93,7 @@ public class NetworkErrorProxy {
public void close() {
if (f != null) {
- f.channel().close();
+ f.channel().close().syncUninterruptibly();
}
if (bossGroup != null && !bossGroup.isShuttingDown()) {
bossGroup.shutdownGracefully(0, 150, TimeUnit.MILLISECONDS).syncUninterruptibly();