From 88105559f73f1493434ff80f8b4398b8faf897b4 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Thu, 28 May 2020 00:38:13 +0530 Subject: [PATCH] Fix regression due to incorrect optional use --- chatto/src/main/java/org/ros/chatto/controller/Home.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatto/src/main/java/org/ros/chatto/controller/Home.java b/chatto/src/main/java/org/ros/chatto/controller/Home.java index 4291214..59e1d0f 100644 --- a/chatto/src/main/java/org/ros/chatto/controller/Home.java +++ b/chatto/src/main/java/org/ros/chatto/controller/Home.java @@ -26,7 +26,7 @@ public class Home { @RequestMapping("/") public String showPage(Model model, Principal principal) { - final String welcomeMessage = Optional.of(principal).map(p -> { + final String welcomeMessage = Optional.ofNullable(principal).map(p -> { return String.format("Welcome back %s!", p.getName()); }).orElse("Welcome to chatto"); model.addAttribute("message", welcomeMessage);