From 02949fc4a7248c0e329f688c3ae2a1a8eb048e6e Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Sun, 21 Jul 2013 20:39:07 -0400
Subject: [PATCH] Fix failing tests

---
 .../simp/handler/AnnotationMethodMessageHandler.java | 12 +++++++-----
 .../simp/handler/SimpleBrokerMessageHandler.java     | 12 +++++++-----
 ...sts.java => SimpleBrokerMessageHandlerTests.java} |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)
 rename spring-messaging/src/test/java/org/springframework/messaging/simp/handler/{SimpleBrokerWebMessageHandlerTests.java => SimpleBrokerMessageHandlerTests.java} (99%)

diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
index f6d31a17a8..59757f8cb5 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
@@ -61,6 +61,7 @@ import org.springframework.messaging.support.converter.MessageConverter;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ReflectionUtils.MethodFilter;
 
 
@@ -270,11 +271,12 @@ public class AnnotationMethodMessageHandler implements MessageHandler, Applicati
 	}
 
 	private boolean checkDestinationPrefix(String destination) {
-		if ((destination != null) && (this.destinationPrefixes != null)) {
-			for (String prefix : this.destinationPrefixes) {
-				if (destination.startsWith(prefix)) {
-					return true;
-				}
+		if ((destination == null) || CollectionUtils.isEmpty(this.destinationPrefixes)) {
+			return true;
+		}
+		for (String prefix : this.destinationPrefixes) {
+			if (destination.startsWith(prefix)) {
+				return true;
 			}
 		}
 		return false;
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java
index 48a20cefd2..dbbcc0fa90 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java
@@ -28,6 +28,7 @@ import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
 import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
 
 
@@ -103,11 +104,12 @@ public class SimpleBrokerMessageHandler implements MessageHandler {
 	}
 
 	private boolean checkDestinationPrefix(String destination) {
-		if ((destination != null) && (this.destinationPrefixes != null)) {
-			for (String prefix : this.destinationPrefixes) {
-				if (destination.startsWith(prefix)) {
-					return true;
-				}
+		if ((destination == null) || CollectionUtils.isEmpty(this.destinationPrefixes)) {
+			return true;
+		}
+		for (String prefix : this.destinationPrefixes) {
+			if (destination.startsWith(prefix)) {
+				return true;
 			}
 		}
 		return false;
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerWebMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java
similarity index 99%
rename from spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerWebMessageHandlerTests.java
rename to spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java
index 156c59ad7d..c2875af861 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerWebMessageHandlerTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.*;
  * @author Rossen Stoyanchev
  * @since 4.0
  */
-public class SimpleBrokerWebMessageHandlerTests {
+public class SimpleBrokerMessageHandlerTests {
 
 	private SimpleBrokerMessageHandler messageHandler;