You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2012/02/15 00:35:22 UTC

svn commit: r1244272 - in /thrift/trunk: compiler/cpp/src/generate/t_java_generator.cc lib/java/src/org/apache/thrift/ProcessFunction.java

Author: bryanduxbury
Date: Tue Feb 14 23:35:22 2012
New Revision: 1244272

URL: http://svn.apache.org/viewvc?rev=1244272&view=rev
Log:
THRIFT-1447. java: NullpointerException in ProcessFunction.class :in 'oneway' method

Patch: Ihor Mysak

Modified:
    thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
    thrift/trunk/lib/java/src/org/apache/thrift/ProcessFunction.java

Modified: thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
URL: http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc?rev=1244272&r1=1244271&r2=1244272&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc (original)
+++ thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc Tue Feb 14 23:35:22 2012
@@ -2673,6 +2673,10 @@ void t_java_generator::generate_process_
   indent(f_service_) << "  return new " << argsname << "();" << endl;
   indent(f_service_) << "}" << endl << endl;
 
+  indent(f_service_) << "protected boolean isOneway() {" << endl;
+  indent(f_service_) << "  return " << ((tfunction->is_oneway())?"true":"false") << ";" << endl;
+  indent(f_service_) << "}" << endl << endl;
+
   indent(f_service_) << "public " << resultname << " getResult(I iface, " << argsname << " args) throws org.apache.thrift.TException {" << endl;
   indent_up();
   if (!tfunction->is_oneway()) {

Modified: thrift/trunk/lib/java/src/org/apache/thrift/ProcessFunction.java
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/src/org/apache/thrift/ProcessFunction.java?rev=1244272&r1=1244271&r2=1244272&view=diff
==============================================================================
--- thrift/trunk/lib/java/src/org/apache/thrift/ProcessFunction.java (original)
+++ thrift/trunk/lib/java/src/org/apache/thrift/ProcessFunction.java Tue Feb 14 23:35:22 2012
@@ -30,12 +30,16 @@ public abstract class ProcessFunction<I,
     }
     iprot.readMessageEnd();
     TBase result = getResult(iface, args);
-    oprot.writeMessageBegin(new TMessage(getMethodName(), TMessageType.REPLY, seqid));
-    result.write(oprot);
-    oprot.writeMessageEnd();
-    oprot.getTransport().flush();
+    if(!isOneway()) {
+      oprot.writeMessageBegin(new TMessage(getMethodName(), TMessageType.REPLY, seqid));
+      result.write(oprot);
+      oprot.writeMessageEnd();
+      oprot.getTransport().flush();
+    }
   }
 
+  protected abstract boolean isOneway();
+
   public abstract TBase getResult(I iface, T args) throws TException;
 
   public abstract T getEmptyArgsInstance();