Skip to content

Commit

Permalink
Merge cceccf5 into af0811d
Browse files Browse the repository at this point in the history
  • Loading branch information
jponge authored Jun 17, 2022
2 parents af0811d + cceccf5 commit d8a08af
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public static void setDefaultExecutor(Executor s) {
DEFAULT_SCHEDULER.shutdownNow();
}
DEFAULT_EXECUTOR = s;
DEFAULT_SCHEDULER = new MutinyScheduler(s);
DEFAULT_SCHEDULER = (s instanceof ScheduledExecutorService) ? (ScheduledExecutorService) s : new MutinyScheduler(s);
}

public static ScheduledExecutorService getDefaultWorkerPool() {
Expand Down Expand Up @@ -286,7 +286,7 @@ public static boolean canCallerThreadBeBlocked() {

/**
* Defines a custom dropped exception handler.
*
*
* @param handler the handler, must not be {@code null} and must not throw an exception or it will also be lost.
*/
public static void setDroppedExceptionHandler(Consumer<Throwable> handler) {
Expand Down Expand Up @@ -361,7 +361,7 @@ public static <T> Predicate<T> decorate(Predicate<T> predicate) {

/**
* Log from an operator.
*
* <p>
* This method should never be called directly but only from {@link Multi#log(String)} and {@link Uni#log(String)}.
*
* @param identifier the event identifier
Expand All @@ -375,7 +375,7 @@ public static void logFromOperator(String identifier, String event, Object value

/**
* Defines operator logging behavior for {@link Multi#log(String)} and {@link Uni#log(String)}.
*
*
* @param operatorLogger the new operator logger
*/
public static void setOperatorLogger(OperatorLogger operatorLogger) {
Expand All @@ -395,7 +395,7 @@ public interface OperatorLogger {

/**
* Actual logging behavior.
*
*
* @param identifier the event identifier
* @param event the event as a string
* @param value the value, if any or {@code null}
Expand Down

0 comments on commit d8a08af

Please sign in to comment.