Fix NPE in the DefaultSessionFactoryLocator

artembilan · artembilan · commit 00b771d8a8f8 · 2020-02-07T10:51:22.000-05:00
**Cherry-pick to 5.2.x**
diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/DefaultSessionFactoryLocator.java
@@ -89,7 +89,9 @@ public SessionFactory<F> removeSessionFactory(Object key) {
 
 	@Override
 	public SessionFactory<F> getSessionFactory(@Nullable Object key) {
-		return this.factories.getOrDefault(key, this.defaultFactory);
+		return key == null
+				? this.defaultFactory
+				: this.factories.getOrDefault(key, this.defaultFactory);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,9 @@ public SessionFactory<F> removeSessionFactory(Object key) {`
`89`	`89`
`90`	`90`	`@Override`
`91`	`91`	`public SessionFactory<F> getSessionFactory(@Nullable Object key) {`
`92`		`- return this.factories.getOrDefault(key, this.defaultFactory);`
	`92`	`+ return key == null`
	`93`	`+ ? this.defaultFactory`
	`94`	`+ : this.factories.getOrDefault(key, this.defaultFactory);`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`}`