[flink] 01/02: [hotfix] Simplify ActorSystem construction

[chesnay]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 77f911ae657fe569d8a80e0bfffa1e58179f4af7
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Sat Jun 10 10:11:56 2023 +0200

    [hotfix] Simplify ActorSystem construction
    
    The option was never empty.
---
 .../java/org/apache/flink/runtime/rpc/akka/RobustActorSystem.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/RobustActorSystem.java
 
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/RobustActorSystem.java
index 3658c46cdd7..17b41b22d22 100644
--- 
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/RobustActorSystem.java
+++ 
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/akka/RobustActorSystem.java
@@ -65,13 +65,13 @@ public abstract class RobustActorSystem extends 
ActorSystemImpl {
                                 Optional.empty(),
                                 Optional.of(applicationConfig),
                                 Optional.empty())),
-                Option.apply(uncaughtExceptionHandler));
+                uncaughtExceptionHandler);
     }
 
     private static RobustActorSystem create(
             String name,
             ActorSystemSetup setup,
-            Option<Thread.UncaughtExceptionHandler> uncaughtExceptionHandler) {
+            Thread.UncaughtExceptionHandler uncaughtExceptionHandler) {
         final Optional<BootstrapSetup> bootstrapSettings = 
setup.get(BootstrapSetup.class);
         final ClassLoader classLoader = 
RobustActorSystem.class.getClassLoader();
         final Config appConfig =
@@ -89,7 +89,7 @@ public abstract class RobustActorSystem extends 
ActorSystemImpl {
                 new RobustActorSystem(name, appConfig, classLoader, defaultEC, 
setup) {
                     @Override
                     public Thread.UncaughtExceptionHandler 
uncaughtExceptionHandler() {
-                        return 
uncaughtExceptionHandler.getOrElse(super::uncaughtExceptionHandler);
+                        return uncaughtExceptionHandler;
                     }
                 };
         robustActorSystem.start();