1 files changed, 19 insertions, 14 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index e76bf4f69b9..a3ef97c7a71 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -365,7 +365,8 @@ be_interface::relative_name (const char *localname,
 
 
 // Am I in some kind of a multiple inheritance?
-int be_interface::in_mult_inheritance (void)
+int 
+be_interface::in_mult_inheritance (void)
 {
   if (this->in_mult_inheritance_ == -1)
     {
@@ -386,7 +387,8 @@ int be_interface::in_mult_inheritance (void)
   return this->in_mult_inheritance_;
 }
 
-void be_interface::in_mult_inheritance (int mi)
+void 
+be_interface::in_mult_inheritance (int mi)
 {
   if (this->in_mult_inheritance_ == -1)
     {
@@ -394,6 +396,14 @@ void be_interface::in_mult_inheritance (int mi)
     }
 }
 
+void 
+be_interface::redefine (AST_Interface *from)
+{
+  be_interface *bi = be_interface::narrow_from_decl (from);
+  this->var_out_seq_decls_gen_ = bi->var_out_seq_decls_gen_;
+  AST_Interface::redefine (from);
+}
+
 // Gen copy constructors,
 void
 be_interface::gen_copy_ctors (TAO_OutStream *os)
@@ -545,6 +555,11 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
 void
 be_interface:: gen_var_out_seq_decls (void)
 {
+  if (this->var_out_seq_decls_gen_ == 1)
+    {
+      return;
+    }
+
   TAO_OutStream *os = tao_cg->client_header ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
@@ -585,6 +600,8 @@ be_interface:: gen_var_out_seq_decls (void)
           << "static CORBA::Object_ptr tao_upcast (void *);" << be_uidt_nl
           << "};";
     }
+
+  this->var_out_seq_decls_gen_ = 1;
 }
 
 // ****************************************************************
@@ -1995,18 +2012,6 @@ be_interface::has_mixed_parentage (void)
   return this->has_mixed_parentage_;
 }
 
-int 
-be_interface::var_out_seq_decls_gen (void) const
-{
-  return this->var_out_seq_decls_gen_;
-}
-
-void 
-be_interface::var_out_seq_decls_gen (int val)
-{
-  this->var_out_seq_decls_gen_ = val;
-}
-
 const char *
 be_interface::base_proxy_impl_name (void)
 {