GH-730: Fix NPE in the MessageProperties

Fixes #730
spring-projects · Mar 28, 2018 · d6a5a75 · d6a5a75
1 parent c8d66d2
commit d6a5a75
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java b/spring-amqp/src/main/java/org/springframework/amqp/core/MessageProperties.java
@@ -568,6 +568,14 @@ else if (!this.contentType.equals(other.contentType)) {
 		if (!Arrays.equals(this.correlationId, other.correlationId)) {
 			return false;
 		}
+		if (this.correlationIdString == null) {
+			if (other.correlationIdString != null) {
+				return false;
+			}
+		}
+		else if (!this.correlationIdString.equals(other.correlationIdString)) {
+			return false;
+		}
 		if (this.deliveryMode != other.deliveryMode) {
 			return false;
 		}

diff --git a/spring-amqp/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java b/spring-amqp/src/test/java/org/springframework/amqp/core/MessagePropertiesTests.java
@@ -17,6 +17,7 @@
 package org.springframework.amqp.core;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
@@ -41,4 +42,11 @@ public void testReplyToNullByDefault() throws Exception {
 		assertEquals(null, properties.getReplyToAddress());
 	}
 
+	@Test
+	public void tesNoNullPointerInEquals() {
+		MessageProperties mp = new MessageProperties();
+		MessageProperties mp2 = new MessageProperties();
+		assertTrue(mp.equals(mp2));
+	}
+
 }