diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:53:56 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:53:56 +0000 |
| commit | 3def0ad5b1cde0d6b582ff207e9f7670c2df8692 (patch) | |
| tree | 073e2b4a6100bf6565f8023a6872254c3d8fd2e7 /jurt | |
| parent | ac53b502776dbc84ffc63fddbd3d10d6c343c678 (diff) | |
INTEGRATION: CWS jl3 (1.33.10); FILE MERGED
2003/12/10 16:21:21 sb 1.33.10.1: #i22352# The workaround to interrupt the dispatcher thread is also needed for 1.3.1.
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 14 |
1 files changed, 7 insertions, 7 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 f78fbbcfb0b4..515218e57c73 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.34 $ + * $Revision: 1.35 $ * - * last change: $Author: kz $ $Date: 2004-03-25 11:03:46 $ + * last change: $Author: kz $ $Date: 2004-03-25 14:53:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,7 @@ import com.sun.star.uno.Any; * 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.34 $ $ $Date: 2004-03-25 11:03:46 $ + * @version $Revision: 1.35 $ $ $Date: 2004-03-25 14:53:56 $ * @author Kay Ramme * @see com.sun.star.lib.uno.environments.remote.IProtocol * @since UDK1.0 @@ -741,12 +741,12 @@ public class java_remote_bridge // message dispatcher stays in the socket read method, even if // the socket has been closed. Suspending and resuming the // message dispatcher lets it notice the closed socket. Only - // use this workaround for Linux JDK1.3.0 from Sun or Blackdown. - // This workaround is dangerouse and may hardlock the VM. + // use this workaround for Linux JRE 1.3.0 and 1.3.1 from Sun + // and Blackdown. This workaround is dangerouse and may + // hardlock the VM. if (System.getProperty("os.name", "").toLowerCase().equals( "linux") - && System.getProperty("java.version", "").startsWith( - "1.3.0") + && System.getProperty("java.version", "").startsWith("1.3.") && (System.getProperty("java.vendor", "").toLowerCase(). indexOf("sun") != -1 || System.getProperty("java.vendor", "").toLowerCase(). |