You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/07/25 23:53:05 UTC
git commit: THRIFT-2173 Move FrameBuffer creation to a factory method
for cusomization
Repository: thrift
Updated Branches:
refs/heads/master 84d118884 -> fcd062d6c
THRIFT-2173 Move FrameBuffer creation to a factory method for cusomization
Client: Java
Patch: Eric Newton
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/fcd062d6
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/fcd062d6
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/fcd062d6
Branch: refs/heads/master
Commit: fcd062d6ceb5689fe204329923f6366a5fd711c2
Parents: 84d1188
Author: Roger Meier <ro...@apache.org>
Authored: Fri Jul 25 23:40:27 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Fri Jul 25 23:40:27 2014 +0200
----------------------------------------------------------------------
.../org/apache/thrift/server/TNonblockingServer.java | 12 +++++++++---
.../apache/thrift/server/TThreadedSelectorServer.java | 12 +++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/fcd062d6/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
----------------------------------------------------------------------
diff --git a/lib/java/src/org/apache/thrift/server/TNonblockingServer.java b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
index 3fc8672..10a8eba 100644
--- a/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
+++ b/lib/java/src/org/apache/thrift/server/TNonblockingServer.java
@@ -217,6 +217,14 @@ public class TNonblockingServer extends AbstractNonblockingServer {
}
}
+ protected FrameBuffer createFrameBuffer(final TNonblockingTransport trans,
+ final SelectionKey selectionKey,
+ final AbstractSelectThread selectThread) {
+ return processorFactory_.isAsyncProcessor() ?
+ new AsyncFrameBuffer(trans, selectionKey, selectThread) :
+ new FrameBuffer(trans, selectionKey, selectThread);
+ }
+
/**
* Accept a new connection.
*/
@@ -229,9 +237,7 @@ public class TNonblockingServer extends AbstractNonblockingServer {
clientKey = client.registerSelector(selector, SelectionKey.OP_READ);
// add this key to the map
- FrameBuffer frameBuffer = processorFactory_.isAsyncProcessor() ?
- new AsyncFrameBuffer(client, clientKey,SelectAcceptThread.this) :
- new FrameBuffer(client, clientKey,SelectAcceptThread.this);
+ FrameBuffer frameBuffer = createFrameBuffer(client, clientKey, SelectAcceptThread.this);
clientKey.attach(frameBuffer);
} catch (TTransportException tte) {
http://git-wip-us.apache.org/repos/asf/thrift/blob/fcd062d6/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
----------------------------------------------------------------------
diff --git a/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java b/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
index 16445e5..9eb9f90 100644
--- a/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
+++ b/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
@@ -611,14 +611,20 @@ public class TThreadedSelectorServer extends AbstractNonblockingServer {
}
}
+ protected FrameBuffer createFrameBuffer(final TNonblockingTransport trans,
+ final SelectionKey selectionKey,
+ final AbstractSelectThread selectThread) {
+ return processorFactory_.isAsyncProcessor() ?
+ new AsyncFrameBuffer(trans, selectionKey, selectThread) :
+ new FrameBuffer(trans, selectionKey, selectThread);
+ }
+
private void registerAccepted(TNonblockingTransport accepted) {
SelectionKey clientKey = null;
try {
clientKey = accepted.registerSelector(selector, SelectionKey.OP_READ);
- FrameBuffer frameBuffer = processorFactory_.isAsyncProcessor() ?
- new AsyncFrameBuffer(accepted, clientKey, SelectorThread.this) :
- new FrameBuffer(accepted, clientKey, SelectorThread.this);
+ FrameBuffer frameBuffer = createFrameBuffer(accepted, clientKey, SelectorThread.this);
clientKey.attach(frameBuffer);
} catch (IOException e) {