1 files changed, 17 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 0e4c59a3b2a..670411f142e 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -600,11 +600,27 @@ IceInternal::ThreadPool::run()
 		    {
 			continue;
 		    }
-		    catch(const LocalException& ex)
+		    catch(const SocketException& ex)
 		    {
 			handler->exception(ex);
 			continue;
 		    }
+		    catch(const LocalException& ex)
+		    {
+		        if(handler->datagram())
+			{
+			    if(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0)
+			    {
+			        Warning out(_instance->logger());
+			        out << "datagram connection exception:\n" << ex << '\n' << handler->toString();
+			    }
+			}
+			else
+			{
+			    handler->exception(ex);
+			}
+			continue;
+		    }
 		    
 		    stream.swap(handler->_stream);
 		    assert(stream.i == stream.b.end());