summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2007-04-16 20:08:23 +0000
committerMark Wielaard <mark@klomp.org>2007-04-16 20:08:23 +0000
commit86d77b8d6518a20b5accd466415938fffde4c4cf (patch)
treef5329874c45106a41003bc4f509c191abaca3701
parenta57ee7d5c88fe5d7ad2b7b1d5c5f99a5024be296 (diff)
downloadclasspath-86d77b8d6518a20b5accd466415938fffde4c4cf.tar.gz
Fixes bug #31590
* java/net/URI.java (parseServerAuthority): Allow empty portStr.
-rw-r--r--ChangeLog5
-rw-r--r--java/net/URI.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a71f175a6..fb2c1c7c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-16 Mark Wielaard <mark@klomp.org>
+
+ Fixes bug #31590
+ * java/net/URI.java (parseServerAuthority): Allow empty portStr.
+
2007-04-16 Chris Burdess <dog@gnu.org>
* gnu/xml/stream/XMLParser.java: Work around a problem with
diff --git a/java/net/URI.java b/java/net/URI.java
index 689843c0b..43b10fc41 100644
--- a/java/net/URI.java
+++ b/java/net/URI.java
@@ -693,7 +693,7 @@ public final class URI
String portStr = getURIGroup(matcher, AUTHORITY_PORT_GROUP);
- if (portStr != null)
+ if (portStr != null && ! portStr.isEmpty())
try
{
port = Integer.parseInt(portStr);