SERVER-11776 move port check outside loop

1 files changed, 21 insertions, 18 deletions

diff --git a/src/mongo/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp
index 543d512af37..c183c19c289 100644
--- a/src/mongo/db/commands/isself.cpp
+++ b/src/mongo/db/commands/isself.cpp
@@ -221,24 +221,27 @@ namespace mongo {
 #if !defined(_WIN32) && !defined(__sunos__)
         // on linux and os x we can do a quick check for an ip match
 
-        const vector<string> myaddrs = getMyAddrs();
-        const vector<string> addrs = getAllIPs(_host);
-
-        for (vector<string>::const_iterator i=myaddrs.begin(), iend=myaddrs.end(); i!=iend; ++i) {
-            for (vector<string>::const_iterator j=addrs.begin(), jend=addrs.end(); j!=jend; ++j) {
-                string a = *i;
-                string b = *j;
-
-                // check if the ports match as well
-                if ( (p == serverGlobalParams.port) &&
-                        (a == b || ( str::startsWith( a , "127." ) &&
-                                     str::startsWith( b , "127." ) ))  // 127. is all loopback
-                   ) {
-
-                    // add to cache
-                    scoped_lock lk( isSelfCommand._cacheLock );
-                    isSelfCommand._cache[host] = true;
-                    return true;
+        // no need for ip match if the ports do not match
+        if (p == serverGlobalParams.port) {
+            const vector<string> myaddrs = getMyAddrs();
+            const vector<string> addrs = getAllIPs(_host);
+
+            for (vector<string>::const_iterator i=myaddrs.begin(), iend=myaddrs.end();
+                 i!=iend; ++i) {
+                for (vector<string>::const_iterator j=addrs.begin(), jend=addrs.end();
+                     j!=jend; ++j) {
+                    string a = *i;
+                    string b = *j;
+
+                    if ( a == b || ( str::startsWith( a , "127." ) &&
+                                     str::startsWith( b , "127." ) )  // 127. is all loopback
+                       ) {
+
+                        // add to cache
+                        scoped_lock lk( isSelfCommand._cacheLock );
+                        isSelfCommand._cache[host] = true;
+                        return true;
+                    }
                 }
             }
         }