INTEGRATION: CWS sb31 (1.5.168); FILE MERGED

2005/04/07 11:54:11 sb 1.5.168.1: #120220# Use the current class loader instead of the system class loader to ensure that all UNO classes are loaded through the UnoClassLoader.
This commit is contained in:
Oliver Bolte 2005-06-17 08:54:29 +00:00
parent d598bd7846
commit d1ac8952c8

View file

@ -2,9 +2,9 @@
*
* $RCSfile: JNI_proxy.java,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: rt $ $Date: 2003-04-23 16:32:17 $
* last change: $Author: obo $ $Date: 2005-06-17 09:54:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -75,8 +75,8 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
NativeLibraryLoader.loadLibrary(JNI_proxy.class.getClassLoader(),
"java_uno");
}
protected static ClassLoader s_system_classloader =
ClassLoader.getSystemClassLoader();
protected static ClassLoader s_classloader =
JNI_proxy.class.getClassLoader();
protected static Class s_InvocationHandler [] =
new Class [] { java.lang.reflect.InvocationHandler.class };
@ -158,7 +158,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler
throws Throwable
{
Class proxy_class = java.lang.reflect.Proxy.getProxyClass(
s_system_classloader,
s_classloader,
new Class [] { clazz, IQueryInterface.class,
com.sun.star.lib.uno.Proxy.class } );
return proxy_class.getConstructor( s_InvocationHandler );