Added result population inside TAO_INTERCEPTOR macro

1 files changed, 49 insertions, 15 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 3c1da502255..d593b314290 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -417,9 +417,9 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
   // (b) not needed if exceptions enabled since thats done already (c)
   // not needed if there are no args and exceptions is disabled.
 
-  os->indent ();
-  if (node->argument_count () > 0)
-    *os << ",\n";
+  //  os->indent ();
+  //if (node->argument_count () > 0)
+  //*os << ",\n";
 
   // Generate the formal argument fields which are passed to the RequestInfo object
   ctx = *this->ctx_;
@@ -727,10 +727,54 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
       *os << be_uidt;
     }
 
+  
   // Populate the Request Info with result if any of the invocation
   if (!this->void_return_type (bt))
     {
-      *os << " ri.result (";
+      // Heres what we are going to do to have a uniform way of getting the
+      // return value updated for the Request Info:
+      // declare a operation_retval type object and assign the
+      // _tao_safe_retval._retn () to it.
+      // We pass this to the result updation method (note: it hasnt
+      // got destroyed)
+      // We then put it back into the original _tao_safe_retval
+      // object.
+      // And finally the _retn () is returned from the operation w.o
+      // causing any problems.
+
+      // Generate the return type mapping (same as in the header file)
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
+      visitor = tao_cg->make_visitor (&ctx);
+      
+      if ((!visitor) || (bt->accept (visitor) == -1))
+        {
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "codegen for return type failed\n"),
+                            -1);
+        }
+      delete visitor;
+      *os << "  _tao_retval_info = ";
+      if (bt->size_type () == be_decl::VARIABLE
+          || bt->base_node_type () == AST_Decl::NT_array)
+        {
+                    *os << "_tao_safe_retval._retn ();";
+                    *os << be_nl << "TAO_INTERCEPTOR (" << be_idt << be_idt_nl;
+                    *os << be_nl << " ri.result (_tao_retval_info);"
+                        << be_nl << "_tao_safe_retval = _tao_retval_info;" <<be_nl;
+                    *os <<be_uidt << be_uidt_nl << ");"<<be_nl;
+        }
+      else
+        {
+          *os << "_tao_retval;";
+          *os << be_nl << "TAO_INTERCEPTOR (" << be_idt << be_idt_nl;
+          *os << be_nl << " ri.result (_tao_retval_info);" << be_nl;
+          *os <<be_uidt << be_uidt_nl << ");"<<be_nl;
+        }
+      
       // get the return val
       /*      ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_PRE_INVOKE_CS);
@@ -745,17 +789,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
                                  "codegen for return var failed\n"),
                                 -1);
                                 }*/
-      if (bt->size_type () == be_decl::VARIABLE
-          || bt->base_node_type () == AST_Decl::NT_array)
-        {
-          *os << "_tao_safe_retval.in ()";
-        }
-      else
-        {
-          *os << "_tao_retval";
-        }
-
-          *os <<");" << be_nl;
+      //      *os <<");" << be_nl;
     }
 
   // Oneway operations dont have receive reply since once the request