diff options
| author | Kay Ramme <kr@openoffice.org> | 2001-02-22 16:12:21 +0000 |
|---|---|---|
| committer | Kay Ramme <kr@openoffice.org> | 2001-02-22 16:12:21 +0000 |
| commit | c6811dc6092d0c0834c6253e660c10ce4c5f6e3f (patch) | |
| tree | c223b92d511be60254ca221f675cd35b64eed03b /jurt | |
| parent | e9f2230780c95f2d5f807b9298c5e91d3f12966d (diff) | |
merged diff 1.8.4.5-1.8.4.6 (the source environment has to be set, when creating the procol (#82290#))
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java index b4c2595d555c..97ea99b2a0cb 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java @@ -2,9 +2,9 @@ * * $RCSfile: java_remote_bridge.java,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kr $ $Date: 2001-02-06 13:36:17 $ + * last change: $Author: kr $ $Date: 2001-02-22 17:12:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,7 +131,7 @@ import com.sun.star.uno.IQueryInterface; * The protocol to used is passed by name, the bridge * then looks for it under <code>com.sun.star.lib.uno.protocols</code>. * <p> - * @version $Revision: 1.14 $ $ $Date: 2001-02-06 13:36:17 $ + * @version $Revision: 1.15 $ $ $Date: 2001-02-22 17:12:21 $ * @author Kay Ramme * @see com.sun.star.lib.uno.environments.remote.IProtocol * @since UDK1.0 @@ -505,6 +505,8 @@ public class java_remote_bridge implements IBridge, IReceiver, IRequester, XBrid String protocol = parseAttributes((String)args[0]); + _java_environment = java_environment; + Class protocol_class = Class.forName("com.sun.star.lib.uno.protocols." + protocol + "." + protocol); Constructor protocol_constructor = protocol_class.getConstructor(new Class[] {IBridge.class}); @@ -517,9 +519,6 @@ public class java_remote_bridge implements IBridge, IReceiver, IRequester, XBrid if(args.length > 3) _name = (String)args[3]; - _java_environment = java_environment; - - // be sure that all neccessary members are set if(_java_environment == null || _xConnection == null |