You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/09 04:11:58 UTC
[5/5] accumulo git commit: ACCUMULO-3394 Fix up whitespace
ACCUMULO-3394 Fix up whitespace
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7927906
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7927906
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7927906
Branch: refs/heads/master
Commit: b7927906f980e5d49b02eff44d0edd64a038faf2
Parents: 79fa912
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 8 22:08:36 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 8 22:08:36 2014 -0500
----------------------------------------------------------------------
.../server/thrift/CustomNonBlockingServer.java | 4 ++--
.../apache/accumulo/server/thrift/RpcWrapper.java | 2 +-
.../server/thrift/TBufferedServerSocket.java | 16 ++++++++--------
.../server/thrift/TNonblockingServerSocket.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7927906/server/base/src/main/java/org/apache/accumulo/server/thrift/CustomNonBlockingServer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/thrift/CustomNonBlockingServer.java b/server/base/src/main/java/org/apache/accumulo/server/thrift/CustomNonBlockingServer.java
index ceb0a42..a96f7b5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/thrift/CustomNonBlockingServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/thrift/CustomNonBlockingServer.java
@@ -34,7 +34,7 @@ import org.apache.thrift.transport.TTransportException;
* {@link TNonblockingServer} methods, especially {@link org.apache.thrift.server.TNonblockingServer.SelectAcceptThread}, in order to override the
* {@link org.apache.thrift.server.AbstractNonblockingServer.FrameBuffer} and {@link org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer} with
* one that reveals the client address from its transport.
- *
+ *
* <p>
* The justification for this is explained in https://issues.apache.org/jira/browse/ACCUMULO-1691, and is needed due to the repeated regressions:
* <ul>
@@ -42,7 +42,7 @@ import org.apache.thrift.transport.TTransportException;
* <li>https://issues.apache.org/jira/browse/THRIFT-1464</li>
* <li>https://issues.apache.org/jira/browse/THRIFT-2173</li>
* </ul>
- *
+ *
* <p>
* This class contains a copy of {@link org.apache.thrift.server.TNonblockingServer.SelectAcceptThread} from Thrift 0.9.1, with the slight modification of
* instantiating a custom FrameBuffer, rather than the {@link org.apache.thrift.server.AbstractNonblockingServer.FrameBuffer} and
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7927906/server/base/src/main/java/org/apache/accumulo/server/thrift/RpcWrapper.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/thrift/RpcWrapper.java b/server/base/src/main/java/org/apache/accumulo/server/thrift/RpcWrapper.java
index db1863b..53ed709 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/thrift/RpcWrapper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/thrift/RpcWrapper.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
* {@link TException} only, by wrapping {@link RuntimeException} and {@link Error} as {@link TException}, so it doesn't just close the connection and look like
* a network issue, but informs the client that a {@link TApplicationException} had occurred, as it did in Thrift 0.9.0. This performs similar functions as
* {@link TraceWrap}, but with the additional action of translating exceptions. See also ACCUMULO-1691 and ACCUMULO-2950.
- *
+ *
* @since 1.6.1
*/
public class RpcWrapper {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7927906/server/base/src/main/java/org/apache/accumulo/server/thrift/TBufferedServerSocket.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/thrift/TBufferedServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/thrift/TBufferedServerSocket.java
index bf35bdf..5534313 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/thrift/TBufferedServerSocket.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/thrift/TBufferedServerSocket.java
@@ -27,36 +27,36 @@ import org.apache.thrift.transport.TTransportException;
// Thrift-959 removed the small buffer from TSocket; this adds it back for servers
public class TBufferedServerSocket extends TServerTransport {
-
+
// expose acceptImpl
static class TServerSocket extends org.apache.thrift.transport.TServerSocket {
public TServerSocket(ServerSocket serverSocket) {
super(serverSocket);
}
-
+
public TSocket acceptImplPublic() throws TTransportException {
return acceptImpl();
}
}
-
+
final TServerSocket impl;
final int bufferSize;
-
+
public TBufferedServerSocket(ServerSocket serverSocket, int bufferSize) {
this.impl = new TServerSocket(serverSocket);
this.bufferSize = bufferSize;
}
-
+
@Override
public void listen() throws TTransportException {
impl.listen();
}
-
+
@Override
public void close() {
impl.close();
}
-
+
// Wrap accepted sockets using buffered IO
@Override
protected TTransport acceptImpl() throws TTransportException {
@@ -67,5 +67,5 @@ public class TBufferedServerSocket extends TServerTransport {
throw new TTransportException(e);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7927906/server/base/src/main/java/org/apache/accumulo/server/thrift/TNonblockingServerSocket.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/thrift/TNonblockingServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/thrift/TNonblockingServerSocket.java
index f4b2df4..77c5ca6 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/thrift/TNonblockingServerSocket.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/thrift/TNonblockingServerSocket.java
@@ -36,7 +36,7 @@ import java.nio.channels.SocketChannel;
/**
* Wrapper around ServerSocketChannel.
- *
+ *
* This class is copied from org.apache.thrift.transport.TNonblockingServerSocket version 0.9.
* The only change (apart from the logging statements) is the addition of the {@link #getPort()} method to retrieve the port used by the ServerSocket.
*/