Merge commit 'origin/R3_3_branch'

Conflicts:

	cs/demo/WCF/latency/Client.cs
	cs/demo/WCF/latency_m/Client.cs
	cs/demo/WCF/throughput/Client.cs
	cs/demo/WCF/throughput_m/Client.cs
	cs/demo/WCF/throughput_m/Service.cs
	java/demo/Database/library/BookI.java
	java/demo/Database/library/BookQueryResultI.java
	java/demo/Database/library/Client.java
	java/demo/Database/library/ConnectionPool.java
	java/demo/Database/library/DispatchInterceptorI.java
	java/demo/Database/library/Glacier2Session.ice
	java/demo/Database/library/Glacier2SessionManagerI.java
	java/demo/Database/library/Grammar.java
	java/demo/Database/library/Library.ice
	java/demo/Database/library/LibraryI.java
	java/demo/Database/library/Parser.java
	java/demo/Database/library/ReapThread.java
	java/demo/Database/library/RunParser.java
	java/demo/Database/library/SQLRequestContext.java
	java/demo/Database/library/Scanner.java
	java/demo/Database/library/Server.java
	java/demo/Database/library/Session.ice
	java/demo/Database/library/SessionFactoryI.java
	java/demo/Database/library/SessionI.java
	java/demo/Database/library/Token.java
	java/demo/Database/library/build.xml
	java/demo/Database/library/config.client

1 files changed, 15 insertions, 13 deletions

diff --git a/scripts/Expect.py b/scripts/Expect.py
index 80fe0ae1ada..05a1558234e 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -101,18 +101,20 @@ class reader(threading.Thread):
 
     def trace(self, c):
         if self._trace:
-            self._tbuf.write(c)
-            if c == '\n':
-                content = self._tbuf.getvalue()
-                supress = False
-                if self._tracesupress:
-                    for p in self._tracesupress:
-                        if p.search(content):
-                            supress = True
-                            break
-                if not supress:
-                    sys.stdout.write(content)
-                self._tbuf.truncate(0)
+	    if self._tracesupress:
+		self._tbuf.write(c)
+		if c == '\n':
+		    content = self._tbuf.getvalue()
+		    supress = False
+		    for p in self._tracesupress:
+			if p.search(content):
+			    supress = True
+			    break
+		    if not supress:
+			sys.stdout.write(content)
+		    self._tbuf.truncate(0)
+	    else:
+		sys.stdout.write(c)
 
     def enabletrace(self, supress = None):
 	self.cv.acquire()
@@ -279,7 +281,7 @@ class Expect (object):
 	if self.p is not None:
 	    self.terminate()
 
-    def expect(self, pattern, timeout = 10):
+    def expect(self, pattern, timeout = 20):
     	"""pattern is either a string, or a list of string regexp patterns.
 
 	   timeout == None expect can block indefinitely.