Connector/MXJ commit: r29 - branches/5-0-1-nortel/connector-mxj branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/driverlaunched trunk/conn...

[eherman]

Modified:
   branches/5-0-1-nortel/connector-mxj/CHANGES
   branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
   trunk/connector-mxj/CHANGES
   trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
   trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
Log:
ServerLauncherSocketFactory.shutdown(port) no longer throws, only prints to System.err

Modified: branches/5-0-1-nortel/connector-mxj/CHANGES
===================================================================
--- branches/5-0-1-nortel/connector-mxj/CHANGES	2006-03-20 20:40:07 UTC (rev 28)
+++ branches/5-0-1-nortel/connector-mxj/CHANGES	2006-03-28 03:49:29 UTC (rev 29)
@@ -1,6 +1,9 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
[phone] - ServerLauncherSocketFactory.shutdown(port) no longer throws, only 
+             reports to System.err
+
 5-0-1-nortel
 
 2006-03-20 - made default version 4.1.13

Modified: branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
===================================================================
--- branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java	2006-03-20 20:40:07 UTC (rev 28)
+++ branches/5-0-1-nortel/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java	2006-03-28 03:49:29 UTC (rev 29)
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Enumeration;
@@ -31,6 +32,7 @@
 import com.mysql.management.MysqldResourceI;
 import com.mysql.management.util.Files;
 import com.mysql.management.util.ListToString;
+import com.mysql.management.util.Str;
 
 /**
  * This class is final simply as a hint to the compiler, it may be un-finalized
@@ -135,21 +137,34 @@
         return myMysqlds;
     }
 
+    // -------------------------------------------------------------
     public static void shutdown(int port) {
+        shutdown(System.err, port);
+    }
+
+    public static void shutdown(PrintStream err, int port) {
         Integer mapKey = new Integer(port);
         synchronized (startedMysqlds) {
             Object obj = startedMysqlds.get(mapKey);
+            if (obj == null) {
+                notFoundMsg(err, mapKey);
+                return;
+            }
             MysqldResourceI mysqld = (MysqldResourceI) obj;
-            if (mysqld == null) {
-                throw new MysqldResourceNotFoundException(notFoundMsg(mapKey));
-            }
             startedMysqlds.remove(mapKey);
             mysqld.shutdown();
         }
     }
 
-    private static String notFoundMsg(Object mapKey) {
-        String list = new ListToString().toString(startedMysqlds.keySet());
-        return "mysqld [" + mapKey + "] not found in " + list;
+    private static void notFoundMsg(PrintStream err, Integer mapKey) {
+        synchronized (err) {
+            err.print("[");
+            err.print(new Str()
+                    .shortClassName(ServerLauncherSocketFactory.class));
+            err.print("] ");
+            err.print("mysqld for port " + mapKey + " not found in ");
+            err.print(new ListToString().toString(startedMysqlds.keySet()));
+            err.println();
+        }
     }
 }

Modified: trunk/connector-mxj/CHANGES
===================================================================
--- trunk/connector-mxj/CHANGES	2006-03-20 20:40:07 UTC (rev 28)
+++ trunk/connector-mxj/CHANGES	2006-03-28 03:49:29 UTC (rev 29)
@@ -1,6 +1,9 @@
 # Changelog
 # $Id: CHANGES,v 1.14 2005/10/25 19:11:16 eherman Exp $
 
[phone] - ServerLauncherSocketFactory.shutdown(port) no longer throws, only 
+             reports to System.err
+
 2006-03-16 - swapped out the mysqld binaries for MySQL v5.0.19
            - added ability to specify "mysql-version" as an url parameter
            - extracted splitLines(String) to Str utility class

Modified: trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java	2006-03-20 20:40:07 UTC (rev 28)
+++ trunk/connector-mxj/src/com/mysql/management/HelpOptionsParserTest.java	2006-03-28 03:49:29 UTC (rev 29)
@@ -24,6 +24,7 @@
 
 import junit.framework.TestCase;
 
+import com.mysql.management.util.ListToString;
 import com.mysql.management.util.Streams;
 import com.mysql.management.util.Utils;
 
@@ -50,7 +51,8 @@
         HelpOptionsParser parser = new HelpOptionsParser(System.err,
                 new Utils());
         Map parsed = parser.getOptionsFromHelp(help);
-        assertEquals("TRUE", parsed.get("auto-rehash"));
+        String optStr = new ListToString().toString(parsed);
+        assertEquals(optStr, "TRUE", parsed.get("auto-rehash"));
         // assertEquals("/usr/local/mysql/",
         // parsed.get(MysqldResourceI.BASEDIR));
         // assertEquals("FALSE", parsed.get("bdb"));

Modified: trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java
===================================================================
--- trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java	2006-03-20 20:40:07 UTC (rev 28)
+++ trunk/connector-mxj/src/com/mysql/management/driverlaunched/ServerLauncherSocketFactory.java	2006-03-28 03:49:29 UTC (rev 29)
@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Enumeration;
@@ -31,6 +32,7 @@
 import com.mysql.management.MysqldResourceI;
 import com.mysql.management.util.Files;
 import com.mysql.management.util.ListToString;
+import com.mysql.management.util.Str;
 
 /**
  * This class is final simply as a hint to the compiler, it may be un-finalized
@@ -135,21 +137,34 @@
         return myMysqlds;
     }
 
+    // -------------------------------------------------------------
     public static void shutdown(int port) {
+        shutdown(System.err, port);
+    }
+
+    public static void shutdown(PrintStream err, int port) {
         Integer mapKey = new Integer(port);
         synchronized (startedMysqlds) {
             Object obj = startedMysqlds.get(mapKey);
+            if (obj == null) {
+                notFoundMsg(err, mapKey);
+                return;
+            }
             MysqldResourceI mysqld = (MysqldResourceI) obj;
-            if (mysqld == null) {
-                throw new MysqldResourceNotFoundException(notFoundMsg(mapKey));
-            }
             startedMysqlds.remove(mapKey);
             mysqld.shutdown();
         }
     }
 
-    private static String notFoundMsg(Object mapKey) {
-        String list = new ListToString().toString(startedMysqlds.keySet());
-        return "mysqld [" + mapKey + "] not found in " + list;
+    private static void notFoundMsg(PrintStream err, Integer mapKey) {
+        synchronized (err) {
+            err.print("[");
+            err.print(new Str()
+                    .shortClassName(ServerLauncherSocketFactory.class));
+            err.print("] ");
+            err.print("mysqld for port " + mapKey + " not found in ");
+            err.print(new ListToString().toString(startedMysqlds.keySet()));
+            err.println();
+        }
     }
 }