From b6609ff3921824eee50d546c9312aac29dc2f1b2 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 30 Nov 2017 10:05:30 +0100
Subject: [PATCH] Polish "Fix NullPointer when requesting a session that does
 not exist"

Closes gh-11202
---
 .../boot/actuate/session/SessionsEndpointTests.java         | 6 ++++++
 .../session/SessionsEndpointWebIntegrationTests.java        | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java
index 871c7cb8e7..b0dd0df047 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointTests.java
@@ -81,6 +81,12 @@ public class SessionsEndpointTests {
 		assertThat(result.isExpired()).isEqualTo(session.isExpired());
 	}
 
+	@Test
+	public void getSessionWithIdNotFound() {
+		given(this.repository.findById("not-found")).willReturn(null);
+		assertThat(this.endpoint.getSession("not-found")).isNull();
+	}
+
 	@Test
 	public void deleteSession() {
 		this.endpoint.deleteSession(session.getId());
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java
index ab80decafb..0fb7578ec3 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/session/SessionsEndpointWebIntegrationTests.java
@@ -82,8 +82,10 @@ public class SessionsEndpointWebIntegrationTests {
 
 	@Test
 	public void sessionForIdNotFound() {
-		client.get().uri((builder) -> builder.path("/actuator/sessions/some-session-id-that-does-not-exist")
-										.build()).exchange().expectStatus().isNotFound();
+		client.get()
+				.uri((builder) -> builder.path(
+						"/actuator/sessions/session-id-not-found").build())
+				.exchange().expectStatus().isNotFound();
 	}
 
 	@Configuration