Changeset 8161

Timestamp:

11/14/04 15:29:07 (18 years ago)

Author:

piso

Message:

initRemote(): don't try to parse an empty port string.

File:

• trunk/j/src/org/armedbear/j/File.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/File.java

@@ -2 +2 @@
  * File.java
  *
- * Copyright (C) 1998-2002 Peter Graves
- * $Id: File.java,v 1.13 2002-12-09 15:00:11 piso Exp $
+ * Copyright (C) 1998-2004 Peter Graves
+ * $Id: File.java,v 1.14 2004-11-14 15:29:07 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -182 +182 @@
 
             // Shorten s to what's left (host and port).
-            s = s.substring(index+1);
+            s = s.substring(index + 1);
 
             index = before.indexOf(':');
             if (index >= 0) {
                 userName = before.substring(0, index);
-                password = before.substring(index+1);
+                password = before.substring(index + 1);
             } else {
                 // No ':', no password.
@@ -196 +196 @@
         index = s.indexOf(':');
         if (index >= 0) {
-            // String contains ':', port specified.
+            // String contains ':'. See if port was specified.
             hostName = s.substring(0, index);
-            try {
-                port = Integer.parseInt(s.substring(index+1));
-            }
-            catch (NumberFormatException e) {
-                Log.error(e);
+            String portString = s.substring(index + 1);
+            if (portString.length() > 0) {
+                try {
+                    port = Integer.parseInt(portString);
+                }
+                catch (NumberFormatException e) {
+                    Log.error(e);
+                }
             }
         } else {
-            // No ':', port not specified.
+            // No ':'. Port was not specified.
             hostName = s;
         }