CWS-TOOLING: integrate CWS qadev33

1 files changed, 23 insertions, 7 deletions

diff --git a/qadevOOo/runner/stats/SimpleLogWriter.java b/qadevOOo/runner/stats/SimpleLogWriter.java
index 534f1a28f135..965bf6ebc7ad 100644
--- a/qadevOOo/runner/stats/SimpleLogWriter.java
+++ b/qadevOOo/runner/stats/SimpleLogWriter.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: SimpleLogWriter.java,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.2.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -64,13 +64,25 @@ public class SimpleLogWriter extends PrintWriter implements LogWriter {
     }
 
     public void println(String msg) {
-        if ((ow == null) && (entry != null)) {
+        if ((ow == null) && (entry != null))
+        {
             this.ow = (share.Watcher) entry.UserDefinedParams.get("Watcher");
-            if (this.ow != null) {
+            if (this.ow != null)
+            {
                 this.ow.ping();
             }
-        } else {
-            this.ow.ping();
+        }
+        else
+        {
+            if (ow != null)
+            {
+                this.ow.ping();
+            }
+            else
+            {
+                // special case: ow == null && entry == null
+                System.out.println(msg);
+            }
         }
 
         if (m_bLogging) {
@@ -92,7 +104,11 @@ public class SimpleLogWriter extends PrintWriter implements LogWriter {
         return this.ow;
     }
 
-    public void setWatcher(Object watcher) {
-        entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher);
+    public void setWatcher(Object watcher)
+    {
+        if (watcher != null)
+        {
+            entry.UserDefinedParams.put("Watcher", (share.Watcher) watcher);
+        }
     }
 }