From ca54a9f8787623c4577641342c63bcc7e5482178 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 10 Jan 2020 14:21:51 +0100 Subject: [PATCH] GH-1882 Ensured that BindableProxyFactory.getObject() can return null The call to getObject() may result in NPE if 'type' is null. Regardless of why that may be the getObject() will simply return null instead of throwing an exception Resolves #1882 --- .../cloud/stream/binding/BindableProxyFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java index 1573f7b75..08aec34f3 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java @@ -142,7 +142,7 @@ public class BindableProxyFactory extends AbstractBindableProxyFactory @Override public synchronized Object getObject() { - if (this.proxy == null) { + if (this.proxy == null && this.type != null) { ProxyFactory factory = new ProxyFactory(this.type, this); this.proxy = factory.getProxy(); }