PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Fix Deadlock in EventBus post #1493

Browse Source
This commit is contained in:
Joe 2015-06-03 01:56:05 -04:00 committed by md_5
parent 6c4e684de9
commit 918d7229c2
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
event/src/main/java/net/md_5/bungee/event/EventBus.java
View File

@ -34,33 +34,35 @@ public class EventBus
public void post(Object event)
{
EventHandlerMethod[] handlers;
lock.readLock().lock();
try
{
EventHandlerMethod[] handlers = byEventBaked.get( event.getClass() );
if ( handlers != null )
{
for ( EventHandlerMethod method : handlers )
{
try
{
method.invoke( event );
} catch ( IllegalAccessException ex )
{
throw new Error( "Method became inaccessible: " + event, ex );
} catch ( IllegalArgumentException ex )
{
throw new Error( "Method rejected target/argument: " + event, ex );
} catch ( InvocationTargetException ex )
{
logger.log( Level.WARNING, MessageFormat.format( "Error dispatching event {0} to listener {1}", event, method.getListener() ), ex.getCause() );
}
}
}
handlers = byEventBaked.get( event.getClass() );
} finally
{
lock.readLock().unlock();
}
if ( handlers != null )
{
for ( EventHandlerMethod method : handlers )
{
try
{
method.invoke( event );
} catch ( IllegalAccessException ex )
{
throw new Error( "Method became inaccessible: " + event, ex );
} catch ( IllegalArgumentException ex )
{
throw new Error( "Method rejected target/argument: " + event, ex );
} catch ( InvocationTargetException ex )
{
logger.log( Level.WARNING, MessageFormat.format( "Error dispatching event {0} to listener {1}", event, method.getListener() ), ex.getCause() );
}
}
}
}
private Map<Class<?>, Map<Byte, Set<Method>>> findHandlers(Object listener)