2 files changed, 10 insertions, 39 deletions
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index a4c7db3e694..f6df199a2c3 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -1182,7 +1182,6 @@ Ice::Connection::setState(State state, const LocalException& ex)
 		//
 		if(!(dynamic_cast<const CloseConnectionException*>(_exception.get()) ||
 		     dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) ||
-		     dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) ||
 		     dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) ||
 #ifndef ICEE_PURE_CLIENT
 		     dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get()) ||
@@ -1654,7 +1653,16 @@ Ice::Connection::readStream(IceInternal::BasicStream& stream)
     {
         stream.b.resize(headerSize);
         stream.i = stream.b.begin();
-        _transceiver->read(stream, -1);
+        _transceiver->read(stream,
+#ifdef ICEE_PURE_BLOCKING_CLIENT
+			   _endpoint->timeout()
+#else
+#  ifdef ICEE_BLOCKING_CLIENT
+	                   _blocking ? _endpoint->timeout() :
+#  endif
+			   -1
+#endif
+			   );
     
         ptrdiff_t pos = stream.i - stream.b.begin();
         assert(pos >= headerSize);
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index 236ca498ca3..d781c860a2c 100755
--- a/cppe/src/IceE/LocalException.cpp
+++ b/cppe/src/IceE/LocalException.cpp
@@ -1154,35 +1154,6 @@ Ice::CloseTimeoutException::ice_throw() const
     throw *this;
 }
 
-Ice::ConnectionTimeoutException::ConnectionTimeoutException(const char* __file, int __line) :
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    TimeoutException(__file, __line)
-#else
-    ::Ice::TimeoutException(__file, __line)
-#endif
-{
-}
-
-static const char* __Ice__ConnectionTimeoutException_name = "Ice::ConnectionTimeoutException";
-
-const ::std::string
-Ice::ConnectionTimeoutException::ice_name() const
-{
-    return __Ice__ConnectionTimeoutException_name;
-}
-
-::Ice::Exception*
-Ice::ConnectionTimeoutException::ice_clone() const
-{
-    return new ConnectionTimeoutException(*this);
-}
-
-void
-Ice::ConnectionTimeoutException::ice_throw() const
-{
-    throw *this;
-}
-
 Ice::ProtocolException::ProtocolException(const char* __file, int __line) :
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
     LocalException(__file, __line)
@@ -2067,14 +2038,6 @@ Ice::CloseTimeoutException::toString() const
 }
 
 string
-Ice::ConnectionTimeoutException::toString() const
-{
-    string out = Exception::toString();
-    out += ":\nconnection has timed out";
-    return out;
-}
-
-string
 Ice::ProtocolException::toString() const
 {
     string out = Exception::toString();