summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-29 11:06:48 +0100
committerJose <jose@zeroc.com>2016-02-29 11:06:48 +0100
commitdd73051aaf817ac4efbb828c168577d35ef7303d (patch)
tree9746647c8ddb5d8d8475f969f8bf85104083d83a
parentICE-6865 - Comparison operators for forwarded interfaces/classes undefined (diff)
downloadice-dd73051aaf817ac4efbb828c168577d35ef7303d.tar.bz2
ice-dd73051aaf817ac4efbb828c168577d35ef7303d.tar.xz
ice-dd73051aaf817ac4efbb828c168577d35ef7303d.zip
ICE-6993 Java URL creation from IceBox
-rw-r--r--java/src/Ice/src/main/java/Ice/PluginManagerI.java3
-rw-r--r--java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/java/src/Ice/src/main/java/Ice/PluginManagerI.java b/java/src/Ice/src/main/java/Ice/PluginManagerI.java
index b82c9cc3e45..cbe07501fb4 100644
--- a/java/src/Ice/src/main/java/Ice/PluginManagerI.java
+++ b/java/src/Ice/src/main/java/Ice/PluginManagerI.java
@@ -9,6 +9,8 @@
package Ice;
+import java.net.URLEncoder;
+
public final class PluginManagerI implements PluginManager
{
private static String _kindOfObject = "plugin";
@@ -411,6 +413,7 @@ public final class PluginManagerI implements PluginManager
{
classDir += java.io.File.separator;
}
+ classDir = URLEncoder.encode(classDir);
//
// Reuse an existing class loader if we have already loaded a plug-in with
diff --git a/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
index b9e76631340..ef547cb4ca9 100644
--- a/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/src/main/java/IceBox/ServiceManagerI.java
@@ -9,6 +9,8 @@
package IceBox;
+import java.net.URLEncoder;
+
//
// NOTE: the class isn't final on purpose to allow users to eventually
// extend it.
@@ -521,6 +523,7 @@ public class ServiceManagerI extends _ServiceManagerDisp
{
classDir += java.io.File.separator;
}
+ classDir = URLEncoder.encode(classDir);
//
// Reuse an existing class loader if we have already loaded a plug-in with