procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Naming.java (lookup): Check if the first character of the filename returned by URL.getFile() is a '/'...

Browse source 
2003-12-27  Guilhem Lavaux  <guilhem@kaffe.org>

	* 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
This commit is contained in:
Guilhem Lavaux 2003-12-26 23:23:55 +00:00 • committed by Michael Koch
parent 45d51d7e37
commit a4dc20a946
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libjava/java/rmi/Naming.java
View file

@ -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);
}
/**