diff options
author | Yuri Nesterenko <yan@openjdk.org> | 2022-03-01 17:21:34 +0000 |
---|---|---|
committer | Christoph Langer <clanger@openjdk.org> | 2022-04-08 08:54:34 +0200 |
commit | 5738fd4045adac95abad4a735ecf55bc78ccd73c (patch) | |
tree | 928f16fe367f0c2e66ef365bca48749d076dfed6 | |
parent | 666f21fe139873e877a3b2e05e46437b96e552e7 (diff) | |
download | jdk11-5738fd4045adac95abad4a735ecf55bc78ccd73c.tar.gz |
8282300: Throws NamingException instead of InvalidNameException after JDK-8278972
Reviewed-by: mbaesken
Backport-of: e6afb6ff81c9004aadaa6f694e643de9703dd32d
-rw-r--r-- | src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java index 4bd7d6587d..072bade71f 100644 --- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java +++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java @@ -153,6 +153,12 @@ public class rmiURLContext extends GenericURLContext { throw newNamingException(iae); } } + int fmark = url.indexOf('#', i); + if (fmark > -1) { + if (!acceptsFragment()) { + throw newNamingException(new IllegalArgumentException("URI fragments not supported: " + url)); + } + } if ("".equals(host)) { host = null; @@ -286,12 +292,12 @@ public class rmiURLContext extends GenericURLContext { } NamingException newNamingException(Throwable cause) { - NamingException ne = new NamingException(cause.getMessage()); + NamingException ne = new InvalidNameException(cause.getMessage()); ne.initCause(cause); return ne; } - boolean acceptsFragment() { + protected boolean acceptsFragment() { return true; } } |