icepatch2 fixes

1 files changed, 1 insertions, 58 deletions

diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 36063bdffb9..78b3e2ec298 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -69,36 +69,7 @@ static BOOL WINAPI handlerRoutine(DWORD dwCtrlType)
     CtrlCHandlerCallback callback = _handler->getCallback();
     if(callback != 0)
     {
-	try
-	{
-	    callback(dwCtrlType);
-	}
-    catch(const IceUtil::Exception& ex)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): " << ex << endl;
-    }
-    catch(const std::exception& ex)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): std::exception: " << ex.what() << endl;
-    }
-    catch(const std::string& msg)
-    {
-	cerr  << " (while destroying in response to signal "
-	     << "): " << msg << endl;
-    }
-    catch(const char * msg)
-    {
-	cerr  << " (while destroying in response to signal "
-	     << "): " << msg << endl;
-    }
-    catch(...)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): unknown exception" << endl;
-    }
-
+	callback(dwCtrlType);
     }
     return TRUE;
 }
@@ -175,36 +146,8 @@ sigwaitThread(void*)
 	
 	if(callback != 0)
 	{
-	    try
-	    {
 	    callback(signal);
 	}
-    catch(const IceUtil::Exception& ex)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): " << ex << endl;
-    }
-    catch(const std::exception& ex)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): std::exception: " << ex.what() << endl;
-    }
-    catch(const std::string& msg)
-    {
-	cerr  << " (while destroying in response to signal "
-	     << "): " << msg << endl;
-    }
-    catch(const char * msg)
-    {
-	cerr  << " (while destroying in response to signal "
-	     << "): " << msg << endl;
-    }
-    catch(...)
-    {
-	cerr  << " (while destroying in response to signal " 
-	     << "): unknown exception" << endl;
-    }
-	}
 
 	rc = pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0);
 	assert(rc == 0);