more fixes for bug 4126

1 files changed, 7 insertions, 8 deletions

diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 57c5ba9cf14..0f12e9263e3 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -481,7 +481,13 @@ public class ServiceManagerI extends _ServiceManagerDisp
         info.args = args;
         try
         {
-            Class<?> c = Class.forName(className);
+            Class<?> c = IceInternal.Util.findClass(className);
+            if(c == null)
+            {
+                FailureException e = new FailureException();
+                e.reason = "ServiceManager: class " + className + " not found";
+                throw e;
+            }
             java.lang.Object obj = c.newInstance();
             try
             {
@@ -494,13 +500,6 @@ public class ServiceManagerI extends _ServiceManagerDisp
                 throw e;
             }
         }
-        catch(ClassNotFoundException ex)
-        {
-            FailureException e = new FailureException();
-            e.reason = "ServiceManager: class " + className + " not found";
-            e.initCause(ex);
-            throw e;
-        }
         catch(IllegalAccessException ex)
         {
             FailureException e = new FailureException();