Bug 2664 - do not calculate stack traces

3 files changed, 17 insertions, 5 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 3bd69893744..790c34cead1 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -64,7 +64,7 @@ extern bool ICE_DECLSPEC_IMPORT nullHandleAbort;
 
 }
 
-namespace IceInternal
+namespace IceUtilInternal
 {
 
 extern bool printStackTraces;
@@ -838,7 +838,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
                 if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 1) > 0)
 #endif
                 {
-                    printStackTraces = true;
+                    IceUtilInternal::printStackTraces = true;
                 }
                 
 #ifndef _WIN32
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 2b92afe037a..2a98d72fa3f 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -16,10 +16,10 @@
 
 using namespace std;
 
-namespace IceInternal
+namespace IceUtilInternal
 {
 
-bool printStackTraces = false;
+extern bool printStackTraces;
 
 }
 
@@ -40,7 +40,7 @@ Ice::LoggerOutputBase&
 Ice::operator<<(Ice::LoggerOutputBase& out, const std::exception& ex)
 {
 #ifdef __GNUC__
-    if(IceInternal::printStackTraces)
+    if(IceUtilInternal::printStackTraces)
     {
         const ::IceUtil::Exception* exception = dynamic_cast<const ::IceUtil::Exception*>(&ex);
         if(exception)
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 3ada15e03d7..a2f973fc979 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -21,6 +21,13 @@
 
 using namespace std;
 
+namespace IceUtilInternal
+{
+
+bool printStackTraces = false;
+
+}
+
 namespace
 {
 
@@ -62,6 +69,11 @@ getStackTrace()
 {
     string stackTrace;
 
+    if(!IceUtilInternal::printStackTraces)
+    {
+        return stackTrace;
+    }
+
     const size_t maxDepth = 100;
     void *stackAddrs[maxDepth];