Make unknown field in UnknownUSerException more consistent

2 files changed, 20 insertions, 1 deletions

diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index f26467afe58..6a389699e65 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -27,6 +27,13 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace IceUtilInternal
+{
+
+extern bool ICE_DECLSPEC_IMPORT printStackTraces;
+
+}
+
 IceInternal::IncomingBase::IncomingBase(Instance* instance, ConnectionI* connection, 
                                         const ObjectAdapterPtr& adapter,
                                         bool response, Byte compress, Int requestId) :
@@ -238,6 +245,12 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc)
                 _os.write(replyUnknownLocalException);
                 ostringstream str;
                 str << *le;
+#ifdef __GNUC__
+                if(IceUtilInternal::printStackTraces)
+                {
+                    str <<  '\n' << ex->ice_stackTrace();
+                }
+#endif
                 _os.write(str.str(), false);
             }
             else if(const UserException* ue = dynamic_cast<const UserException*>(&exc))
@@ -245,6 +258,12 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc)
                 _os.write(replyUnknownUserException);
                 ostringstream str;
                 str << *ue;
+#ifdef __GNUC__
+                if(IceUtilInternal::printStackTraces)
+                {
+                    str <<  '\n' << ex->ice_stackTrace();
+                }
+#endif
                 _os.write(str.str(), false);
             }
             else
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 2a98d72fa3f..ab35dd124d7 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -19,7 +19,7 @@ using namespace std;
 namespace IceUtilInternal
 {
 
-extern bool printStackTraces;
+extern bool ICE_DECLSPEC_IMPORT printStackTraces;
 
 }