ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

eventbus: crash on runtime error. (#1888)

Browse Source
This commit is contained in:
Ganom
2019-11-05 19:35:25 -05:00
committed by GitHub
parent 78aa148672
commit 81dddd68d9
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java
View File

@@ -52,7 +52,18 @@ public class EventBus implements EventBusInterface
Disposable disposable = getSubject(eventClass) Disposable disposable = getSubject(eventClass)
.filter(Objects::nonNull) // Filter out null objects, better safe than sorry .filter(Objects::nonNull) // Filter out null objects, better safe than sorry
.cast(eventClass) // Cast it for easier usage .cast(eventClass) // Cast it for easier usage
.subscribe(action, error -> log.error("Error in eventbus", error)); .subscribe(action, error ->
{
if (error instanceof RuntimeException)
{
log.error("Runtime Exception in eventbus", error);
System.exit(0);
}
else
{
log.error("Exception in eventbus", error);
}
});
getCompositeDisposable(lifecycle).add(disposable); getCompositeDisposable(lifecycle).add(disposable);
subscriptionList.put(lifecycle, eventClass); subscriptionList.put(lifecycle, eventClass);
@@ -71,7 +82,18 @@ public class EventBus implements EventBusInterface
.cast(eventClass) // Cast it for easier usage .cast(eventClass) // Cast it for easier usage
.take(takeUntil) .take(takeUntil)
.doFinally(() -> unregister(lifecycle)) .doFinally(() -> unregister(lifecycle))
.subscribe(action, error -> log.error("Error in eventbus", error)); .subscribe(action, error ->
{
if (error instanceof RuntimeException)
{
log.error("Runtime Exception in eventbus", error);
System.exit(0);
}
else
{
log.error("Exception in eventbus", error);
}
});
getCompositeDisposable(lifecycle).add(disposable); getCompositeDisposable(lifecycle).add(disposable);
subscriptionList.put(lifecycle, eventClass); subscriptionList.put(lifecycle, eventClass);