summaryrefslogtreecommitdiffstats
path: root/java/jdk13/files/patch-os_linux.hpp
blob: 696952f18c56f3817f471f8a9083ffc19b02f9de (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
$FreeBSD: ports/java/jdk13/files/patch-os_linux.hpp,v 1.1 2004/11/28 05:29:25 glewis Exp $

--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 5 Jun 2002 05:27:47 -0000   1.4
+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 22 Nov 2004 17:19:42 -0000
@@ -186,7 +186,7 @@
     bool trylock() {
       verify();
       int status = os::Solaris::mutex_trylock(_mutex);
-      if (status == EBUSY)
+      if (status == EBUSY || status == EDEADLK)
    return false;
       assert(status == 0, "mutex_lock");
       return true;
@@ -348,7 +348,7 @@
     bool trylock() {
       verify();
       int status = os::Solaris::mutex_trylock(_mutex);
-      if (status == EBUSY)
+      if (status == EBUSY || status == EDEADLK)
    return false;
       assert(status == 0, "mutex_trylock");
       return true;