From dad004a233a5f2e18dbc995123102a83d260ebb1 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 4 Aug 2011 22:12:14 -0400
Subject: [PATCH] avoiding potential NPE in setReplyToAddress()

---
 .../java/org/springframework/amqp/core/MessageProperties.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
index d2fc56e7..2eb13f7c 100644
--- a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
+++ b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
@@ -165,11 +165,11 @@ public class MessageProperties {
 	}
 
 	public void setReplyToAddress(Address replyTo) {
-		this.replyTo = replyTo.toString();
+		this.replyTo = (replyTo != null) ? replyTo.toString() : null;
 	}
 
 	public Address getReplyToAddress() {
-		return this.replyTo == null ? null : new Address(this.replyTo);
+		return (this.replyTo != null) ? new Address(this.replyTo) : null;
 	}
 
 	public void setContentType(String contentType) {