* gnu/classpath/jdwp/event/ThreadStartEvent.java (Event):

        Event type is "THREAD_START" not "THERAD_END".

        * gnu/classpath/jdwp/transport/SocketTransport.java (ITransport):
        Handle configure strings ":port" and "port".

3 files changed, 36 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index fffa84438..047515388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-29  Keith Seitz  <keiths@redhat.com>
+
+	* gnu/classpath/jdwp/event/ThreadStartEvent.java (Event):
+	Event type is "THREAD_START" not "THERAD_END".
+
+	* gnu/classpath/jdwp/transport/SocketTransport.java (ITransport):
+	Handle configure strings ":port" and "port".
+
 2007-03-29  Francis Kung  <fkung@redhat.com>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
diff --git a/gnu/classpath/jdwp/event/ThreadStartEvent.java b/gnu/classpath/jdwp/event/ThreadStartEvent.java
index f9c507dfb..4eff4409e 100644
--- a/gnu/classpath/jdwp/event/ThreadStartEvent.java
+++ b/gnu/classpath/jdwp/event/ThreadStartEvent.java
@@ -1,6 +1,6 @@
 /* ThreadStartEvent.java -- An event specifying that a new thread
    has started in the virtual machine
-   Copyright (C) 2005 Free Software Foundation
+   Copyright (C) 2005, 2007 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -75,7 +75,7 @@ public class ThreadStartEvent
    * @param thread  the thread ID in which event occurred
    */
   public ThreadStartEvent (Thread thread) {
-    super (JdwpConstants.EventKind.THREAD_END);
+    super (JdwpConstants.EventKind.THREAD_START);
     _thread = thread;
   }
 
diff --git a/gnu/classpath/jdwp/transport/SocketTransport.java b/gnu/classpath/jdwp/transport/SocketTransport.java
index 49d9e1f3b..e3875fe06 100644
--- a/gnu/classpath/jdwp/transport/SocketTransport.java
+++ b/gnu/classpath/jdwp/transport/SocketTransport.java
@@ -1,5 +1,5 @@
 /* SocketTransport.java -- a socket transport
-   Copyright (C) 2005 Free Software Foundation
+   Copyright (C) 2005, 2007 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -89,27 +89,39 @@ class SocketTransport
    * @param  properties  the properties of the JDWP session
    * @throws TransportException for any configury errors
    */
-  public void configure (HashMap properties)
+  public void configure(HashMap properties)
     throws TransportException
   {
-    // Get address [form: "hostname:port"]
-    String p = (String) properties.get (_PROPERTY_ADDRESS);
+    // Get server [form: "y" or "n"]
+    String p = (String) properties.get(_PROPERTY_SERVER);
     if (p != null)
       {
-	String[] s = p.split (":");
-	if (s.length == 2)
-	  {
-	    _host = s[0];
-	    _port = Integer.parseInt (s[1]);
-	  }
+	if (p.toLowerCase().equals("y"))
+	  _server = true;
       }
 
-    // Get server [form: "y" or "n"]
-    p = (String) properties.get (_PROPERTY_SERVER);
+    // Get address [form: "hostname:port"]
+    p = (String) properties.get(_PROPERTY_ADDRESS);
     if (p != null)
       {
-	if (p.toLowerCase().equals ("y"))
-	  _server = true;
+	String[] s = p.split(":");
+	if (s.length == 1)
+	  {
+	    // Assume localhost for non-server case or
+	    // port number for server case
+	    if (_server)
+	      _port = Integer.parseInt(s[0]);
+	    else
+	      _host = "localhost";
+	  }
+	else
+	  {
+	    if (s[0].length() == 0)
+	      _host = "localhost";
+	    else
+	      _host = s[0];
+	    _port = Integer.parseInt(s[1]);
+	  }
       }
   }