From 8380e2073c9dd9e4b7c789c7118bbe7e3246562b Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 29 Jan 2013 12:20:07 +0000
Subject: Tue Jan 29 12:20:08 UTC 2013  Johnny Willemsen 
 <jwillemsen@remedy.nl>

        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
          Fixed bugzilla 4087, thanks to
          Jiang Wei <jiangwei_1976 at yahoo dot com dot cn> for
          providing this patch
---
 CIAO/ChangeLog                                   |  7 +++++++
 CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index bad847251d7..4ca44a9819d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 29 12:20:08 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
+          Fixed bugzilla 4087, thanks to
+          Jiang Wei <jiangwei_1976 at yahoo dot com dot cn> for
+          providing this patch
+
 Tue Jan 29 12:17:09 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 352895d686b..04f42c17259 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -897,7 +897,18 @@ idl3_to_idl2_visitor::visit_porttype_scope_mirror (
               break;
             }
           default:
-            return d->ast_accept (this);
+            {
+              if (d->ast_accept (this) == -1)
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     ACE_TEXT ("idl3_to_idl2_visitor")
+                                     ACE_TEXT ("::visit_porttype_mirror - ")
+                                     ACE_TEXT ("codegen for mirror port failed\n")),
+                                    -1);
+                }
+
+              break;
+            }
         }
     }
 
-- 
cgit v1.2.1