You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/03/22 20:37:04 UTC
svn commit: r1304004 - in /incubator/accumulo/branches/1.3: ./
src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java
Author: ecn
Date: Thu Mar 22 19:37:04 2012
New Revision: 1304004
URL: http://svn.apache.org/viewvc?rev=1304004&view=rev
Log:
ACCUMULO-486: merge to 1.3 branch
Modified:
incubator/accumulo/branches/1.3/ (props changed)
incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java
Propchange: incubator/accumulo/branches/1.3/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4:r1303976
Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java?rev=1304004&r1=1304003&r2=1304004&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java (original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java Thu Mar 22 19:37:04 2012
@@ -33,7 +33,6 @@ import org.apache.accumulo.core.util.Thr
import org.apache.accumulo.server.security.SecurityConstants;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
-import org.apache.thrift.TServiceClient;
import org.apache.thrift.transport.TTransportException;
/**
@@ -117,10 +116,12 @@ public class RemoteLogger {
public synchronized void close() throws NoSuchLogIDException, TException {
try {
- client.close(null, logFile.id);
+ if (client != null)
+ client.close(null, logFile.id);
} finally {
- TServiceClient c = (TServiceClient) client;
- c.getInputProtocol().getTransport().close();
+ MutationLogger.Iface tmp = client;
+ client = null;
+ ThriftUtil.returnClient(tmp);
}
}