diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-09 02:56:03 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-09 02:56:03 +0000 |
| commit | 661a91eca8edc1eb8d2516f867db70a441df2bcf (patch) | |
| tree | 89875cc31bd1075d40f3f5c29d1a389ea267fe70 /libjava/java/net/URI.java | |
| parent | ed36f1cf5a66a3774386a4b6ac54a360d813654a (diff) | |
| download | gcc-661a91eca8edc1eb8d2516f867db70a441df2bcf.tar.gz | |
* java/net/URI.java (AUTHORITY_REGEXP): Handle case where user
name or port is missing.
(AUTHORITY_USERINFO_GROUP, AUTHORITY_HOST_GROUP,
AUTHORITY_PORT_GROUP): Updated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94760 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/URI.java')
| -rw-r--r-- | libjava/java/net/URI.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/java/net/URI.java b/libjava/java/net/URI.java index 4de5095bbbb..23e3e7c9e4a 100644 --- a/libjava/java/net/URI.java +++ b/libjava/java/net/URI.java @@ -65,7 +65,7 @@ public final class URI implements Comparable, Serializable "^(([^:/?#]+):)?((//([^/?#]*))?([^?#]*)(\\?([^#]*))?)?(#(.*))?"; private static final String AUTHORITY_REGEXP = - "^(([^?#]*)@([^?#]*):([^?#]*))?"; + "^((([^?#]*)@)?([^?#:]*)(:([^?#]*)))?"; /** * Valid characters (taken from rfc2396) @@ -115,9 +115,9 @@ public final class URI implements Comparable, Serializable */ private static final int FRAGMENT_GROUP = 10; - private static final int AUTHORITY_USERINFO_GROUP = 2; - private static final int AUTHORITY_HOST_GROUP = 3; - private static final int AUTHORITY_PORT_GROUP = 4; + private static final int AUTHORITY_USERINFO_GROUP = 3; + private static final int AUTHORITY_HOST_GROUP = 4; + private static final int AUTHORITY_PORT_GROUP = 6; private transient String scheme; private transient String rawSchemeSpecificPart; |