From 032bc3b08fe61ff23c8a1002d78a8197893d4f89 Mon Sep 17 00:00:00 2001
From: dugenkui <dugenkui@meituan.com>
Date: Mon, 12 Oct 2020 08:55:41 +0800
Subject: [PATCH] [MINOR] NPE Optimization for Option (#2158)

---
 .../src/main/java/org/apache/hudi/common/util/Option.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/Option.java b/hudi-common/src/main/java/org/apache/hudi/common/util/Option.java
index a67b6ab95..42d605796 100644
--- a/hudi-common/src/main/java/org/apache/hudi/common/util/Option.java
+++ b/hudi-common/src/main/java/org/apache/hudi/common/util/Option.java
@@ -98,6 +98,9 @@ public final class Option<T> implements Serializable {
   }
 
   public <U> Option<U> map(Function<? super T, ? extends U> mapper) {
+    if (null == mapper) {
+      throw new NullPointerException("mapper should not be null");
+    }
     if (!isPresent()) {
       return empty();
     } else {
@@ -140,6 +143,8 @@ public final class Option<T> implements Serializable {
 
   @Override
   public String toString() {
-    return "Option{val=" + val + '}';
+    return val != null
+            ? "Option{val=" + val + "}"
+            : "Optional.empty";
   }
 }