clean up shutdownr1.5.0

1 files changed, 4 insertions, 2 deletions

diff --git a/util/message.cpp b/util/message.cpp
index 14a9c24b4a9..fdb5f38c790 100644
--- a/util/message.cpp
+++ b/util/message.cpp
@@ -146,8 +146,10 @@ namespace mongo {
             if (ret == 0){
                 log() << "select() returned 0" << endl;
                 continue;
-            }else if (ret < 0){
-                log() << "select() failure: ret=" << ret << " " << OUTPUT_ERRNO << endl;
+            }
+            else if (ret < 0){
+                if ( ! inShutdown() )
+                    log() << "select() failure: ret=" << ret << " " << OUTPUT_ERRNO << endl;
                 return;
             }