cache HostAndPort in MessagingPort

2 files changed, 7 insertions, 1 deletions

diff --git a/util/message.cpp b/util/message.cpp
index 16bea2a8b1a..653b5628e78 100644
--- a/util/message.cpp
+++ b/util/message.cpp
@@ -696,7 +696,9 @@ again:
     }
 
     HostAndPort MessagingPort::remote() const {
-        return farEnd;
+        if ( _farEndParsed.port() == -1 )
+            _farEndParsed = HostAndPort( farEnd );
+        return _farEndParsed;
     }
 
 
diff --git a/util/message.h b/util/message.h
index a0b69c30728..37e94334b1b 100644
--- a/util/message.h
+++ b/util/message.h
@@ -152,6 +152,10 @@ namespace mongo {
 
         long long _bytesIn;
         long long _bytesOut;
+        
+        // this is the parsed version of farEnd
+        // mutable because its initialized only on call to remote()
+        mutable HostAndPort _farEndParsed; 
 
     public:
         SockAddr farEnd;