From 89d282125a8d39f7fa9fb2d4a807a48bf1590e63 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@pivotal.io>
Date: Tue, 31 Mar 2020 18:49:05 +0200
Subject: [PATCH] Ensure logPrefix is not null or blank in
 AbstractListenerWriteProcessor

---
 .../server/reactive/AbstractListenerWriteProcessor.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
index db32a5e66e..ee0361e765 100644
--- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
+++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.reactivestreams.Subscription;
 import org.springframework.core.log.LogDelegateFactory;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * Abstract base class for {@code Processor} implementations that bridge between
@@ -87,13 +88,13 @@ public abstract class AbstractListenerWriteProcessor<T> implements Processor<T,
 	 * @since 5.1
 	 */
 	public AbstractListenerWriteProcessor(String logPrefix) {
-		this.logPrefix = logPrefix;
+		this.logPrefix = (StringUtils.hasText(logPrefix) ? logPrefix : "");
 		this.resultPublisher = new WriteResultPublisher(logPrefix);
 	}
 
 
 	/**
-	 * Create an instance with the given log prefix.
+	 * Get the configured log prefix.
 	 * @since 5.1
 	 */
 	public String getLogPrefix() {