From a4dc20a94636a27c0250b3cadbc23758901d8fb7 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Fri, 26 Dec 2003 23:23:55 +0000 Subject: [PATCH] Naming.java (lookup): Check if the first character of the filename returned by URL.getFile() is a '/'... 2003-12-27 Guilhem Lavaux * java/rmi/Naming.java (lookup): Check if the first character of the filename returned by URL.getFile() is a '/', only if it is the case we cut this first character and call the registry with the good name. (bind): Likewise. (rebind): Likewise. From-SVN: r75044 --- libjava/ChangeLog | 8 ++++++++ libjava/java/rmi/Naming.java | 33 +++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2a01dce..3323079 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-12-27 Guilhem Lavaux + + * java/rmi/Naming.java (lookup): Check if the first character of the + filename returned by URL.getFile() is a '/', only if it is the case + we cut this first character and call the registry with the good name. + (bind): Likewise. + (rebind): Likewise. + 2003-12-26 Guilhem Lavaux Mark Wielaard diff --git a/libjava/java/rmi/Naming.java b/libjava/java/rmi/Naming.java index 2dd50d3..1d2e68b 100644 --- a/libjava/java/rmi/Naming.java +++ b/libjava/java/rmi/Naming.java @@ -62,7 +62,14 @@ public static Remote lookup(String name) throws NotBoundException, MalformedURLE // hack to accept "rmi://host:port/service" strings if(name.startsWith("rmi:")){ name = name.substring(4); } URL u = new URL("http:" + name); - return (getRegistry(u).lookup(u.getFile().substring(1))); + String filename = u.getFile(); + + // If the filename begins with a slash we must cut it for + // name resolution. + if (filename.charAt(0) == '/') + return (getRegistry(u).lookup(filename.substring(1))); + else + return (getRegistry(u).lookup(filename)); } /** @@ -75,7 +82,13 @@ public static Remote lookup(String name) throws NotBoundException, MalformedURLE */ public static void bind(String name, Remote obj) throws AlreadyBoundException, MalformedURLException, RemoteException { URL u = new URL("http:" + name); - getRegistry(u).bind(u.getFile().substring(1), obj); + String filename = u.getFile(); + // If the filename begins with a slash we must cut it for + // name resolution. + if (filename.charAt(0) == '/') + getRegistry(u).bind(filename.substring(1), obj); + else + getRegistry(u).bind(filename, obj); } /** @@ -87,7 +100,13 @@ public static void bind(String name, Remote obj) throws AlreadyBoundException, M */ public static void unbind(String name) throws RemoteException, NotBoundException, MalformedURLException { URL u = new URL("http:" + name); - getRegistry(u).unbind(u.getFile().substring(1)); + String filename = u.getFile(); + // If the filename begins with a slash we must cut it for + // name resolution. + if (filename.charAt(0) == '/') + getRegistry(u).unbind(filename.substring(1)); + else + getRegistry(u).unbind(filename); } /** @@ -100,7 +119,13 @@ public static void unbind(String name) throws RemoteException, NotBoundException */ public static void rebind(String name, Remote obj) throws RemoteException, MalformedURLException { URL u = new URL("http:" + name); - getRegistry(u).rebind(u.getFile().substring(1), obj); + String filename = u.getFile(); + // If the filename begins with a slash we must cut it for + // name resolution. + if (filename.charAt(0) == '/') + getRegistry(u).rebind(filename.substring(1), obj); + else + getRegistry(u).rebind(filename, obj); } /** -- 2.7.4