From 95b1bd71e36da01e3173eefe7ed4bfc31f01abcf Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Tue, 1 May 2012 20:43:26 +0000 Subject: [PATCH] THRIFT-1588 Java Generated Exceptions don't follow inheritance pattern as other Languages - reduce NUM_QUERIES within test for slow machines ;-r git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1332809 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_java_generator.cc | 3 ++- .../test/org/apache/thrift/server/TestNonblockingServer.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 compiler/cpp/src/generate/t_java_generator.cc mode change 100644 => 100755 lib/java/test/org/apache/thrift/server/TestNonblockingServer.java diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc old mode 100644 new mode 100755 index 6ef38388..945d6ef0 --- a/compiler/cpp/src/generate/t_java_generator.cc +++ b/compiler/cpp/src/generate/t_java_generator.cc @@ -355,6 +355,7 @@ string t_java_generator::java_type_imports() { "import org.apache.thrift.protocol.TTupleProtocol;\n" + "import org.apache.thrift.protocol.TProtocolException;\n" + "import org.apache.thrift.EncodingUtils;\n" + + "import org.apache.thrift.TException;\n" + "import java.util.List;\n" + "import java.util.ArrayList;\n" + "import java.util.Map;\n" + @@ -1242,7 +1243,7 @@ void t_java_generator::generate_java_struct_definition(ofstream &out, (in_class ? "static " : "") << "class " << tstruct->get_name() << " "; if (is_exception) { - out << "extends Exception "; + out << "extends TException "; } out << "implements org.apache.thrift.TBase<" << tstruct->get_name() << ", " << tstruct->get_name() << "._Fields>, java.io.Serializable, Cloneable"; diff --git a/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java b/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java old mode 100644 new mode 100755 index b23cd5cf..78376956 --- a/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java +++ b/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java @@ -36,7 +36,7 @@ public class TestNonblockingServer extends ServerTestBase { private Thread serverThread; private TServer server; - private static final int NUM_QUERIES = 10000; + private static final int NUM_QUERIES = 1000; protected TServer getServer(TProcessor processor, TNonblockingServerSocket socket, TProtocolFactory protoFactory, TTransportFactory factory) { final Args args = new Args(socket).processor(processor).protocolFactory(protoFactory); -- 2.17.1