Tue Dec 6 13:25:04 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
          Fixed generation issues in case dds4ccm

3 files changed, 12 insertions, 8 deletions

diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
index cf9367d8d85..fb94bdcb84d 100644
--- a/TAO/ChangeLog.BRANCH
+++ b/TAO/ChangeLog.BRANCH
@@ -1,3 +1,9 @@
+Tue Dec  6 13:25:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+          Fixed generation issues in case dds4ccm
+
 Tue Dec  6 09:22:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
         * TAO_IDL/be/be_visitor_component/component_svts.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
index 036200da0ee..206d5b416be 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp
@@ -152,7 +152,7 @@ be_visitor_context_svth::visit_connector (be_connector *node)
 int
 be_visitor_context_svth::visit_uses (be_uses *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }
@@ -229,7 +229,7 @@ be_visitor_context_svth::visit_uses (be_uses *node)
 int
 be_visitor_context_svth::visit_publishes (be_publishes *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }
@@ -273,7 +273,7 @@ be_visitor_context_svth::visit_publishes (be_publishes *node)
 int
 be_visitor_context_svth::visit_emits (be_emits *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }
@@ -306,5 +306,3 @@ be_visitor_context_svth::visit_emits (be_emits *node)
 
   return 0;
 }
-
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
index 45a49f841de..9405997ef7a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp
@@ -102,7 +102,7 @@ be_visitor_context_svts::visit_connector (be_connector *node)
 int
 be_visitor_context_svts::visit_uses (be_uses *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }
@@ -129,7 +129,7 @@ be_visitor_context_svts::visit_uses (be_uses *node)
 int
 be_visitor_context_svts::visit_publishes (be_publishes *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }
@@ -270,7 +270,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node)
 int
 be_visitor_context_svts::visit_emits (be_emits *node)
 {
-  if (node->imported ())
+  if (node->imported () && node->is_local ())
     {
       return 0;
     }