Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a MutableBoolean to synchronize on instead of a Boolean

Browse Source 
The code synchronizes on a boxed primitive constant, such as an Boolean.

Since there normally exist only two Boolean objects, this code could be synchronizing on the same object as other, unrelated code, leading to unresponsiveness and possible deadlock.

This commit uses the MutableBoolean class from commons-lang, which is included in bukkit.jar.
This commit is contained in:
riking 2013-08-30 18:40:48 -07:00
parent f78872c157
commit 5c6cd57a4d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/mcore/InternalListener.java
View File

@ -154,7 +154,7 @@ public class InternalListener implements Listener
if (cause != DamageCause.BLOCK_EXPLOSION) return; if (cause != DamageCause.BLOCK_EXPLOSION) return;
// ... and that explosion is a fake ... // ... and that explosion is a fake ...
if (SmokeUtil.fakeExplosion == false) return; if (!SmokeUtil.fakeExplosion.booleanValue()) return;
// ... then cancel the event and the damage. // ... then cancel the event and the damage.
event.setCancelled(true); event.setCancelled(true);

7
src/com/massivecraft/mcore/util/SmokeUtil.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.mcore.util;
import java.util.Collection; import java.util.Collection;
import java.util.Random; import java.util.Random;
import org.apache.commons.lang.mutable.MutableBoolean;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
@ -89,14 +90,14 @@ public class SmokeUtil
fakeExplosion(location, 4F); fakeExplosion(location, 4F);
} }
public static Boolean fakeExplosion = false; public static MutableBoolean fakeExplosion = new MutableBoolean(false);
public static void fakeExplosion(Location location, float power) public static void fakeExplosion(Location location, float power)
{ {
synchronized (fakeExplosion) synchronized (fakeExplosion)
{ {
fakeExplosion = true; fakeExplosion.setValue(true);
location.getWorld().createExplosion(location.getX(), location.getY(), location.getZ(), power, false, false); location.getWorld().createExplosion(location.getX(), location.getY(), location.getZ(), power, false, false);
fakeExplosion = false; fakeExplosion.setValue(false);
} }
} }