diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:50:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 10:50:15 +0000 |
| commit | adc976a427ea243cfe59d7584d552185f777742d (patch) | |
| tree | d860a802e737765d959268cb3b801ef0e4d4d9fc /jurt/com/sun | |
| parent | 29c4371a08118dd6fd5eadcc2b26681de70445f6 (diff) | |
INTEGRATION: CWS jl16 (1.4.58); FILE MERGED
2005/08/22 08:56:15 sb 1.4.58.1: #i52831# Added comments explaining why the hack to fix this error in the bean module works.
Diffstat (limited to 'jurt/com/sun')
| -rw-r--r-- | jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java index 798331338346..7674a0a8a4ab 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java @@ -4,9 +4,9 @@ * * $RCSfile: ProxyFactory.java,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-07 18:56:59 $ + * last change: $Author: hr $ $Date: 2005-09-23 11:50:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,6 +129,9 @@ final class ProxyFactory { return "[Proxy:" + System.identityHashCode(proxy) + "," + oid + "," + type + "]"; } else if (method.equals(METHOD_QUERY_INTERFACE)) { + // See the comment in java_remote_bridge.mapInterfaceTo for one + // reason why this implementation must not satisfy a request for + // a super-interface with a proxy itself: return args[0].equals(type) ? proxy : request("queryInterface", args); } else if (method.equals(METHOD_GET_OID)) { |