1 files changed, 19 insertions, 15 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
index 8d4ca76849b..8e4d70d6e59 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp
@@ -17,11 +17,7 @@ be_visitor_component_ami_rh_ex_base::be_visitor_component_ami_rh_ex_base (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
     iface_ (0),
-    scope_name_ (0),
-    iface_name_ (0),
-    smart_scope_ (0),
-    prefix_ ("AMI4CCM_"),
-    suffix_ ("ReplyHandler")
+    port_ (0)
 {
 }
 
@@ -55,14 +51,22 @@ be_visitor_component_ami_rh_ex_base::init (void)
 {
   UTL_Scope *s = this->iface_->defined_in ();
   AST_Decl *scope = ScopeAsDecl (s);
-  this->scope_name_ = scope->full_name ();
   bool global = (scope->node_type () == AST_Decl::NT_root);
-  this->smart_scope_ = (global ? "" : "::");
-  this->iface_name_ =
-    this->iface_->original_local_name ()->get_string ();
-  this->class_name_ = ACE_CString (this->prefix_)
-                      + this->iface_name_
-                      + this->suffix_;
+  const char *smart_scope = (global ? "" : "::");
+
+  ACE_CString base ("AMI4CCM_");
+  base += this->iface_->original_local_name ()->get_string ();
+  base += "ReplyHandler";
+
+  this->base_class_name_ = scope->full_name ();
+  this->base_class_name_ += smart_scope;
+  this->base_class_name_ += base;
+
+  this->class_name_ = base;
+  this->class_name_ += '_';
+  this->class_name_ +=
+    this->port_->original_local_name ()->get_string ();
+  this->class_name_ += "_i";
 }
 
 void
@@ -76,7 +80,7 @@ be_visitor_component_ami_rh_ex_base::gen_excep_op (
 
   if (for_defn)
     {
-      os_ << this->class_name_ << "_i::";
+      os_ << this->class_name_ << "::";
     }
 
   os_ << prefix << node->local_name ()->get_string ()
@@ -104,7 +108,7 @@ be_visitor_component_ami_rh_ex_base::gen_attr_op (
 
   if (for_defn)
     {
-      os_ << this->class_name_ << "_i::";
+      os_ << this->class_name_ << "::";
     }
 
   os_ << "get_" << node->local_name ()->get_string ()
@@ -145,7 +149,7 @@ be_visitor_component_ami_rh_ex_base::gen_attr_op (
 
       if (for_defn)
         {
-          os_ << this->class_name_ << "_i::";
+          os_ << this->class_name_ << "::";
         }
 
       os_ << "set_" << node->local_name ()->get_string ()