TudbuT/tuddylib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix lock not waiting
All checks were successful
/ Build & Publish (push) Successful in 49s
Details

Browse source
This commit is contained in:
Daniella / Tove 2024-06-25 05:22:22 +02:00
parent b173cf594a
commit 8fd30ea15d
Signed by: TudbuT
GPG key ID: B3CF345217F202D3
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/de/tudbut/tools/Lock.java
View file

@ -57,21 +57,22 @@ public class Lock extends SimpleLock {
*/ */
public synchronized void waitHere() { public synchronized void waitHere() {
if(!isTimed) { if(!isTimed) {
while(relocking) do
super.waitHere(); super.waitHere();
while(relocking);
return; return;
} }
if(!super.isLocked()) if(!super.isLocked())
return; return;
while(relocking) { do {
long wt = timeLeft0(); long wt = timeLeft0();
if(wt == 0) { if(wt == 0) {
unlock(); unlock();
return; return;
} }
super.waitHere(wt); super.waitHere(wt);
} } while(relocking);
} }
/** /**
@ -83,19 +84,19 @@ public class Lock extends SimpleLock {
return; return;
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
if(!isTimed) { if(!isTimed) {
while(relocking) { do {
long sectionOffset = System.currentTimeMillis() - start; long sectionOffset = System.currentTimeMillis() - start;
long wt = timeout - sectionOffset; long wt = timeout - sectionOffset;
if(wt == 0) if(wt == 0)
break; break;
super.waitHere(wt); super.waitHere(wt);
} } while(relocking);
return; return;
} }
if(!super.isLocked()) if(!super.isLocked())
return; return;
while(relocking) { do {
long wt = timeLeft0(); long wt = timeLeft0();
if(wt == 0) { if(wt == 0) {
unlock(); unlock();
@ -106,7 +107,7 @@ public class Lock extends SimpleLock {
if(wt == 0) if(wt == 0)
break; break;
super.waitHere(wt); super.waitHere(wt);
} } while(relocking);
} }
/** /**