Imported Upstream version 2.0.0

1 files changed, 5 insertions, 5 deletions

diff --git a/s/client.cpp b/s/client.cpp
index c053289..0da05b6 100644
--- a/s/client.cpp
+++ b/s/client.cpp
@@ -55,7 +55,7 @@ namespace mongo {
 
         if ( p ) {
             HostAndPort r = p->remote();
-            if ( _remote.port() == -1 )
+            if ( ! _remote.hasPort() )
                 _remote = r;
             else if ( _remote != r ) {
                 stringstream ss;
@@ -96,7 +96,7 @@ namespace mongo {
         BSONElement cid = gle["connectionId"];
 
         if ( cid.eoo() ) {
-            error() << "getLastError writeback can't work because of version mis-match" << endl;
+            error() << "getLastError writeback can't work because of version mismatch" << endl;
             return;
         }
 
@@ -114,7 +114,7 @@ namespace mongo {
             return res;
         
         if ( fromWriteBackListener ) {
-            LOG(1) << "not doing recusrive writeback" << endl;
+            LOG(1) << "not doing recursive writeback" << endl;
             return res;
         }
         
@@ -150,7 +150,7 @@ namespace mongo {
             }
             catch( std::exception &e ){
                 
-                warning() << "Could not get last error." << e.what() << endl;
+                warning() << "could not get last error." << causedBy( e ) << endl;
                 
                 // Catch everything that happens here, since we need to ensure we return our connection when we're
             	// finished.
@@ -223,7 +223,7 @@ namespace mongo {
         	    // Safe to return here, since we haven't started any extra processing yet, just collecting
         	    // responses.
                 
-        	    warning() << "Could not get last error." << e.what() << endl;
+        	    warning() << "could not get last error." << causedBy( e ) << endl;
                 conn.done();
                 
                 return false;