From 66c34ff3e7cb940536b7257033c097491862d04f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Aug 2014 13:49:16 +0200 Subject: java: remove workarounds for missing functionality pre java 1.5 Since we now require java 1.5 Change-Id: I9e195f77c81bd9447f8e29c1862c68a57846c8a3 --- .../uno/bridges/java_remote/java_remote_bridge.java | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'jurt') 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 4f76c5c304ce..e997fa48d55d 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 @@ -502,25 +502,6 @@ public class java_remote_bridge if (Thread.currentThread() != _messageDispatcher && _messageDispatcher.isAlive()) { - // This is a workaround for a Linux Sun JDK1.3 problem: The - // 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 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.") - && (System.getProperty("java.vendor", "").toLowerCase(). - indexOf("sun") != -1 - || System.getProperty("java.vendor", "").toLowerCase(). - indexOf("blackdown") != -1)) - { - _messageDispatcher.suspend(); - _messageDispatcher.resume(); - } - _messageDispatcher.join(1000); if (_messageDispatcher.isAlive()) { _messageDispatcher.interrupt(); -- cgit