diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 8 | ||||
| -rwxr-xr-x | cpp/test/Glacier2/router/run.py | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index f04b074367f..492bb72c398 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -38,14 +38,6 @@ Ice::ConnectionI::validate() { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - if(_threadPerConnection->getThreadControl() != IceUtil::ThreadControl()) - { - cout << "_threadPerConnection->getThreadControl() != IceUtil::ThreadControl()" << endl; - } - else - { - cout << "_threadPerConnection->getThreadControl() == IceUtil::ThreadControl()" << endl; - } if(_instance->threadPerConnection() && _threadPerConnection->getThreadControl() != IceUtil::ThreadControl()) { diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index 99f3046607b..131046d474c 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -9,7 +9,7 @@ # ********************************************************************** import os, sys -import time + for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): @@ -34,8 +34,6 @@ TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" -time.sleep(30) - name = os.path.join("Glacier2", "router") TestUtil.mixedClientServerTest(name) |