URI.java (AUTHORITY_REGEXP): Handle case where user name or port is missing.
* 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. From-SVN: r94760
This commit is contained in:
parent
9f4faeaee1
commit
e99e6d711d
2 changed files with 11 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue