Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 3 insertions, 8 deletions

diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index aa6b7bb0d32..a003b0c9598 100755..100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -10,6 +10,7 @@
 
 import sys
 from demoscript import *
+from scripts import Expect
 
 def runtests(client, server, secure):
     print "testing twoway",
@@ -58,13 +59,7 @@ def runtests(client, server, secure):
     client.sendline('P')
     client.expect('server delay is now set to 2500ms')
     client.sendline('t')
-    # With Java/C# under Windows the tcp connection shutdown takes
-    # longer than expected... hence we use a 6 second timeout instead
-    # of the expected ~4s.
-    #
-    # http://bugzilla/bugzilla/show_bug.cgi?id=2425
-    #
-    client.expect('.*TimeoutException.*', timeout=6)
+    client.expect('.*TimeoutException.*', timeout=5)
     server.expect('Hello World!')
     server.expect('Hello World!') # second because op is idempotent
     client.sendline('P')