endpoint selection fixes

11 files changed, 36 insertions, 49 deletions

diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp
index d8753565839..553a91a52cf 100644
--- a/cpp/src/Ice/Endpoint.cpp
+++ b/cpp/src/Ice/Endpoint.cpp
@@ -100,12 +100,6 @@ IceInternal::Endpoint::streamRead(Stream* s, EndpointPtr& v)
     }
 }
 
-bool
-IceInternal::Endpoint::regular() const
-{
-    return !secure() && !datagram();
-}
-
 IceInternal::UnknownEndpoint::UnknownEndpoint(Stream* s)
 {
     s->read(const_cast<vector<Byte>&>(_rawBytes));
diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h
index 879157dfc41..2d1b63d72f2 100644
--- a/cpp/src/Ice/Endpoint.h
+++ b/cpp/src/Ice/Endpoint.h
@@ -88,11 +88,6 @@ public:
     virtual bool secure() const = 0;
 
     //
-    // Convenience function for STL algorithms: !datagram() && !secure()
-    //
-    bool regular() const;
-
-    //
     // Return client- and server-side Transceivers for the endpoint,
     // or null if a TransceiverPtr can only be created by Acceptors or
     // Connectors.
diff --git a/cpp/src/Ice/LocalException.cpp b/cpp/src/Ice/LocalException.cpp
index a3a5eed671b..7b83095d853 100644
--- a/cpp/src/Ice/LocalException.cpp
+++ b/cpp/src/Ice/LocalException.cpp
@@ -241,7 +241,7 @@ Ice::WrongObjectAdapterException::operator=(const WrongObjectAdapterException& e
 string
 Ice::WrongObjectAdapterException::toString() const
 {
-    string s = debugInfo() + "no suitable endpoint information available";
+    string s = debugInfo() + "wrong object adapter";
     return s;
 }
 
@@ -277,7 +277,7 @@ Ice::NoEndpointException::operator=(const NoEndpointException& ex)
 string
 Ice::NoEndpointException::toString() const
 {
-    string s = debugInfo() + "no suitable endpoint information available";
+    string s = debugInfo() + "no suitable endpoint available";
     return s;
 }
 
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 3f257907966..ff8842c07be 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -309,14 +309,6 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt)
     {
 	ex.raise();
     }
-    catch (const NoEndpointException&)
-    {
-	//
-	// We always retry on a no endpoint exception, as we might
-	// have a forwarded reference, but we retry with the original
-	// reference.
-	//
-    }
     catch (const CloseConnectionException&)
     {
 	//
@@ -407,7 +399,6 @@ Handle< ::IceDelegate::Ice::Object>
 IceProxy::Ice::Object::__getDelegate()
 {
     JTCSyncT<JTCMutex> sync(*this);
-
     if (!_delegate)
     {
 	ObjectPtr obj = _reference->instance->objectAdapterFactory()->proxyToObject(this);
@@ -524,6 +515,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& reference)
     // upon initial initialization.
     //
     _reference = reference;
+
     vector<EndpointPtr> endpoints;
     switch (_reference->mode)
     {
@@ -532,7 +524,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& reference)
 	case Reference::ModeBatchOneway:
 	{
 	    remove_copy_if(_reference->endpoints.begin(), _reference->endpoints.end(), back_inserter(endpoints), 
-			   not1(::IceInternal::constMemFun(&Endpoint::regular)));
+			   ::IceInternal::constMemFun(&Endpoint::datagram));
 	    break;
 	}
 	
@@ -551,6 +543,12 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& reference)
 				  not1(::IceInternal::constMemFun(&Endpoint::secure))),
 			endpoints.end());
     }
+    else
+    {
+	endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
+				  ::IceInternal::constMemFun(&Endpoint::secure)),
+			endpoints.end());
+    }
 
     if (endpoints.empty())
     {
diff --git a/cpp/src/Ice/SslAcceptor.cpp b/cpp/src/Ice/SslAcceptor.cpp
index d23f2fe08fa..f33c761d51e 100644
--- a/cpp/src/Ice/SslAcceptor.cpp
+++ b/cpp/src/Ice/SslAcceptor.cpp
@@ -34,7 +34,7 @@ IceInternal::SslAcceptor::close()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "stopping to accept connections at " << toString();
+	s << "stopping to accept ssl connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -51,7 +51,7 @@ IceInternal::SslAcceptor::shutdown()
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "shutting down accepting connections at " << toString();
+	s << "shutting down accepting ssl connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -76,7 +76,7 @@ IceInternal::SslAcceptor::listen()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "accepting connections at " << toString();
+	s << "accepting ssl connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif
@@ -90,7 +90,7 @@ IceInternal::SslAcceptor::accept(int timeout)
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "accepted connection\n" << fdToString(fd);
+	s << "accepted ssl connection\n" << fdToString(fd);
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
diff --git a/cpp/src/Ice/SslConnector.cpp b/cpp/src/Ice/SslConnector.cpp
index 630dc1af8cd..a053bccfbdf 100644
--- a/cpp/src/Ice/SslConnector.cpp
+++ b/cpp/src/Ice/SslConnector.cpp
@@ -28,7 +28,7 @@ IceInternal::SslConnector::connect(int timeout)
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "trying to connect to " << toString();
+	s << "trying to establish ssl connection to " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif
@@ -40,7 +40,7 @@ IceInternal::SslConnector::connect(int timeout)
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "connection established\n" << fdToString(fd);
+	s << "ssl connection established\n" << fdToString(fd);
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
diff --git a/cpp/src/Ice/SslTransceiver.cpp b/cpp/src/Ice/SslTransceiver.cpp
index ba11c44533c..90a0fac7bce 100644
--- a/cpp/src/Ice/SslTransceiver.cpp
+++ b/cpp/src/Ice/SslTransceiver.cpp
@@ -34,7 +34,7 @@ IceInternal::SslTransceiver::close()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "closing connection\n" << toString();
+	s << "closing ssl connection\n" << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -52,7 +52,7 @@ IceInternal::SslTransceiver::shutdown()
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "shutting down connection\n" << toString();
+	s << "shutting down ssl connection\n" << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -155,7 +155,7 @@ IceInternal::SslTransceiver::write(Buffer& buf, int timeout)
 	if (_traceLevels->network >= 3)
 	{
 	    ostringstream s;
-	    s << "sent " << ret << " of " << packetSize << " bytes via SSL\n" << toString();
+	    s << "sent " << ret << " of " << packetSize << " bytes via ssl\n" << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif	
@@ -254,7 +254,7 @@ IceInternal::SslTransceiver::read(Buffer& buf, int timeout)
 	if (_traceLevels->network >= 3)
 	{
 	    ostringstream s;
-	    s << "received " << ret << " of " << packetSize << " bytes via SSL\n" << toString();
+	    s << "received " << ret << " of " << packetSize << " bytes via ssl\n" << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif	
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 28c43b9ef16..9d8c1857829 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -34,7 +34,7 @@ IceInternal::TcpAcceptor::close()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "stopping to accept connections at " << toString();
+	s << "stopping to accept tcp connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -51,7 +51,7 @@ IceInternal::TcpAcceptor::shutdown()
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "shutting down accepting connections at " << toString();
+	s << "shutting down accepting tcp connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -76,7 +76,7 @@ IceInternal::TcpAcceptor::listen()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "accepting connections at " << toString();
+	s << "accepting tcp connections at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif
@@ -90,7 +90,7 @@ IceInternal::TcpAcceptor::accept(int timeout)
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "accepted connection\n" << fdToString(fd);
+	s << "accepted tcp connection\n" << fdToString(fd);
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 3e595be4bc4..af7b7763f1e 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -28,7 +28,7 @@ IceInternal::TcpConnector::connect(int timeout)
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "trying to connect to " << toString();
+	s << "trying to establish tcp connection to " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif
@@ -40,7 +40,7 @@ IceInternal::TcpConnector::connect(int timeout)
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "connection established\n" << fdToString(fd);
+	s << "tcp connection established\n" << fdToString(fd);
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 9785922af1f..c7de1c35011 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -34,7 +34,7 @@ IceInternal::TcpTransceiver::close()
     if (_traceLevels->network >= 1)
     {
 	ostringstream s;
-	s << "closing connection\n" << toString();
+	s << "closing tcp connection\n" << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -52,7 +52,7 @@ IceInternal::TcpTransceiver::shutdown()
     if (_traceLevels->network >= 2)
     {
 	ostringstream s;
-	s << "shutting down connection\n" << toString();
+	s << "shutting down tcp connection\n" << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -155,7 +155,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 	if (_traceLevels->network >= 3)
 	{
 	    ostringstream s;
-	    s << "sent " << ret << " of " << packetSize << " bytes via TCP\n" << toString();
+	    s << "sent " << ret << " of " << packetSize << " bytes via tcp\n" << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif	
@@ -254,7 +254,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 	if (_traceLevels->network >= 3)
 	{
 	    ostringstream s;
-	    s << "received " << ret << " of " << packetSize << " bytes via TCP\n" << toString();
+	    s << "received " << ret << " of " << packetSize << " bytes via tcp\n" << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif	
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index a22a0ee065e..f9650ab2d1a 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -36,11 +36,11 @@ IceInternal::UdpTransceiver::close()
 	ostringstream s;
 	if (_sender)
 	{
-	    s << "stopping to send packets to " << toString();
+	    s << "stopping to send udp packets to " << toString();
 	}
 	else
 	{
-	    s << "stopping to receive packets at " << toString();
+	    s << "stopping to receive udp packets at " << toString();
 	}
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
@@ -81,7 +81,7 @@ repeat:
     if (_traceLevels->network >= 3)
     {
 	ostringstream s;
-	s << "sent " << ret << " bytes via UDP to " << toString();
+	s << "sent " << ret << " bytes via udp to " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -117,7 +117,7 @@ repeat:
     if (_traceLevels->network >= 3)
     {
 	ostringstream s;
-	s << "received " << ret << " bytes via UDP at " << toString();
+	s << "received " << ret << " bytes via udp at " << toString();
 	_logger->trace(_traceLevels->networkCat, s.str());
     }
 #endif	
@@ -172,7 +172,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
 	if (_traceLevels->network >= 1)
 	{
 	    ostringstream s;
-	    s << "starting to send packets to " << toString();
+	    s << "starting to send udp packets to " << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif	
@@ -207,7 +207,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, int por
 	if (_traceLevels->network >= 1)
 	{
 	    ostringstream s;
-	    s << "starting to receive packets at " << toString();
+	    s << "starting to receive udp packets at " << toString();
 	    _logger->trace(_traceLevels->networkCat, s.str());
 	}
 #endif