Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/real-logic/aeron
Browse files Browse the repository at this point in the history
  • Loading branch information
tmontgomery committed Dec 11, 2019
2 parents 1d5c33a + 76d0d5c commit ef104a1
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions aeron-client/src/main/java/io/aeron/Aeron.java
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,15 @@ public static class Configuration
public static final ErrorHandler DEFAULT_ERROR_HANDLER =
(throwable) ->
{
synchronized (System.err)
final PrintStream err = System.err;
synchronized (err)
{
System.err.println(System.currentTimeMillis() + " Exception:");
throwable.printStackTrace();
err.println(System.currentTimeMillis() + " Exception:");
throwable.printStackTrace(err);
}
if (throwable instanceof DriverTimeoutException)
{
System.err.printf(
err.printf(
"%n***%n*** timeout for the Media Driver - is it currently running? exiting%n***%n");
System.exit(-1);
}
Expand Down

0 comments on commit ef104a1

Please sign in to comment.