From 83ede0edd22a3debf30779780a1070dfe01fc88e Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Wed, 23 Sep 2009 11:49:04 -0230
Subject: Bug 3972 - reduced trace level for some output and other minor
 cleanup

---
 cpp/src/Ice/TcpAcceptor.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'cpp/src/Ice/TcpAcceptor.cpp')

diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 453d0cbccc1..1b0e4251ba5 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -15,6 +15,7 @@
 #include <Ice/Network.h>
 #include <Ice/Exception.h>
 #include <Ice/Properties.h>
+#include <IceUtil/StringUtil.h>
 
 #ifdef ICE_USE_IOCP
 #  include <Mswsock.h>
@@ -71,22 +72,12 @@ IceInternal::TcpAcceptor::listen()
         Trace out(_logger, _traceLevels->networkCat);
         out << "accepting tcp connections at " << toString();
 
-        if(_traceLevels->network >= 3)
+        vector<string> interfaces = 
+            getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
+        if(!interfaces.empty())
         {
-            vector<string> interfaces = 
-                getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
-            if(!interfaces.empty())
-            {
-                out << "\nlocal interfaces: ";
-                for(unsigned int i = 0; i < interfaces.size(); ++i)
-                {
-                    if(i != 0)
-                    {
-                        out << ", ";
-                    }
-                    out << interfaces[i];
-                }
-            }
+            out << "\nlocal interfaces: ";
+            out << IceUtilInternal::joinString(interfaces, ", ");
         }
     }
 }
-- 
cgit v1.2.3