INTEGRATION: CWS qadev29 (1.3.8); FILE MERGED

2007/03/05 08:22:46 lla 1.3.8.1: #144950# concurrency problem solution

qadevOOo/runner/convwatch/DB.java

@@ -75,22 +75,19 @@ public class DB extends DBHelper
 
     private static String getEnvironment()
         {
-            if (System.getProperty("os.name").toLowerCase().startsWith("windows"))
+            if (OSHelper.isWindows())
             {
                 return "wntmsci";
             }
-            else if (System.getProperty("os.name").toLowerCase().startsWith("solaris") &&
-                System.getProperty("os.arch").equals("x86"))
+            else if ( OSHelper.isSolarisIntel())
             {
                 return "unxsoli";
             }
-            else if (System.getProperty("os.name").toLowerCase().startsWith("solaris") &&
-                System.getProperty("os.arch").equals("sparc"))
+            else if ( OSHelper.isSolarisSparc())
             {
                 return "unxsols";
             }
-            else if (System.getProperty("os.name").toLowerCase().startsWith("linux") &&
-                     System.getProperty("os.arch").equals("i386"))
+            else if ( OSHelper.isLinuxIntel())
             {
                 return "unxlngi";
             }

qadevOOo/runner/convwatch/GlobalLogWriter.java

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: GlobalLogWriter.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2006-11-21 14:09:48 $
+ *  last change: $Author: ihi $ $Date: 2007-06-04 13:30:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,6 +51,11 @@ public class GlobalLogWriter
             return m_aGlobalLogWriter;
         }
 
+//     public static synchronized void initialize()
+//         {
+//             get().initialize(null, true);
+//         }
+
     public static synchronized void set(LogWriter _aLog)
         {
             m_aGlobalLogWriter = _aLog;