From a86b114d82c678b49ab2b43c16abff1f8239d5d6 Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Fri, 4 Sep 2009 12:34:41 -0700
Subject: bug 4196 - add class loader to InitializationData

---
 java/src/IceInternal/ObjectInputStream.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'java/src/IceInternal/ObjectInputStream.java')

diff --git a/java/src/IceInternal/ObjectInputStream.java b/java/src/IceInternal/ObjectInputStream.java
index e5fa8e0b45a..fc0168fadc1 100644
--- a/java/src/IceInternal/ObjectInputStream.java
+++ b/java/src/IceInternal/ObjectInputStream.java
@@ -18,10 +18,11 @@ package IceInternal;
 public class ObjectInputStream extends java.io.ObjectInputStream
 {
     public
-    ObjectInputStream(java.io.InputStream in)
+    ObjectInputStream(Instance instance, java.io.InputStream in)
         throws java.io.IOException
     {
         super(in);
+        _instance = instance;
     }
 
     protected Class<?>
@@ -30,7 +31,7 @@ public class ObjectInputStream extends java.io.ObjectInputStream
     {
         try
         {
-            Class<?> c = Util.findClass(cls.getName());
+            Class<?> c = _instance.findClass(cls.getName());
             if(c != null)
             {
                 return c;
@@ -42,4 +43,6 @@ public class ObjectInputStream extends java.io.ObjectInputStream
             throw new ClassNotFoundException("unable to resolve class " + cls.getName(), ex);
         }
     }
+
+    private Instance _instance;
 }
-- 
cgit v1.2.3