THRIFT-960 update to use AbstractServerArgs

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@1026712 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java b/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
index 90dc473..18343b0 100644 (file)
--- a/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
+++ b/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
@@ -22,6 +22,7 @@ package org.apache.thrift.test;
 import org.apache.thrift.server.THsHaServer;
 import org.apache.thrift.server.TNonblockingServer;
 import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.THsHaServer.Args;
 import org.apache.thrift.transport.TNonblockingServerSocket;
 import org.apache.thrift.server.ServerTestBase.TestHandler;
 
@@ -57,10 +58,10 @@ public class TestNonblockingServer extends TestServer {
 
       if (hsha) {
         // HsHa Server
-        serverEngine = new THsHaServer(testProcessor, tServerSocket);
+        serverEngine = new THsHaServer(new Args(tServerSocket).processor(testProcessor));
       } else {
         // Nonblocking Server
-        serverEngine = new TNonblockingServer(testProcessor, tServerSocket);
+        serverEngine = new TNonblockingServer(new Args(tServerSocket).processor(testProcessor));
       }
 
       // Run it

diff --git a/lib/java/test/org/apache/thrift/test/TestServer.java b/lib/java/test/org/apache/thrift/test/TestServer.java
index c507e6e..e4c4f6f 100644 (file)
--- a/lib/java/test/org/apache/thrift/test/TestServer.java
+++ b/lib/java/test/org/apache/thrift/test/TestServer.java
@@ -28,6 +28,8 @@ import java.util.Set;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TServer.Args;
+import org.apache.thrift.server.TSimpleServer;
 import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.server.ServerTestBase.TestHandler;
@@ -67,10 +69,10 @@ public class TestServer {
       TServer serverEngine;
 
       // Simple Server
-      // serverEngine = new TSimpleServer(testProcessor, tServerSocket);
+      serverEngine = new TSimpleServer(new Args(tServerSocket).processor(testProcessor));
 
       // ThreadPool Server
-      serverEngine = new TThreadPoolServer(testProcessor, tServerSocket, tProtocolFactory);
+      //serverEngine = new TThreadPoolServer(testProcessor, tServerSocket, tProtocolFactory);
 
       // Run it
       System.out.println("Starting the server on port " + port + "...");