SimpAnnotationMethodMessageHandler skips template variable check in case of no pattern

Issue: SPR-13704
(cherry picked from commit e8417ea)

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -64,7 +64,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.PathMatcher;
 import org.springframework.validation.Validator;
@@ -289,9 +288,8 @@ public final void stop(Runnable callback) {
 
 
 	protected List<HandlerMethodArgumentResolver> initArgumentResolvers() {
-		ConfigurableBeanFactory beanFactory =
-				(ClassUtils.isAssignableValue(ConfigurableApplicationContext.class, getApplicationContext())) ?
-						((ConfigurableApplicationContext) getApplicationContext()).getBeanFactory() : null;
+		ConfigurableBeanFactory beanFactory = (getApplicationContext() instanceof ConfigurableApplicationContext ?
+						((ConfigurableApplicationContext) getApplicationContext()).getBeanFactory() : null);
 
 		List<HandlerMethodArgumentResolver> resolvers = new ArrayList<HandlerMethodArgumentResolver>();
 
@@ -315,11 +313,13 @@ protected List<? extends HandlerMethodReturnValueHandler> initReturnValueHandler
 		List<HandlerMethodReturnValueHandler> handlers = new ArrayList<HandlerMethodReturnValueHandler>();
 
 		// Annotation-based return value types
-		SendToMethodReturnValueHandler sth = new SendToMethodReturnValueHandler(this.brokerTemplate, true);
+		SendToMethodReturnValueHandler sth =
+				new SendToMethodReturnValueHandler(this.brokerTemplate, true);
 		sth.setHeaderInitializer(this.headerInitializer);
 		handlers.add(sth);
 
-		SubscriptionMethodReturnValueHandler sh = new SubscriptionMethodReturnValueHandler(this.clientMessagingTemplate);
+		SubscriptionMethodReturnValueHandler sh =
+				new SubscriptionMethodReturnValueHandler(this.clientMessagingTemplate);
 		sh.setHeaderInitializer(this.headerInitializer);
 		handlers.add(sh);
 
@@ -429,13 +429,15 @@ public int compare(SimpMessageMappingInfo info1, SimpMessageMappingInfo info2) {
 	protected void handleMatch(SimpMessageMappingInfo mapping, HandlerMethod handlerMethod,
 			String lookupDestination, Message<?> message) {
 
-		String matchedPattern = mapping.getDestinationConditions().getPatterns().iterator().next();
-		Map<String, String> vars = getPathMatcher().extractUriTemplateVariables(matchedPattern, lookupDestination);
-
-		if (!CollectionUtils.isEmpty(vars)) {
-			MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class);
-			Assert.state(accessor != null && accessor.isMutable());
-			accessor.setHeader(DestinationVariableMethodArgumentResolver.DESTINATION_TEMPLATE_VARIABLES_HEADER, vars);
+		Set<String> patterns = mapping.getDestinationConditions().getPatterns();
+		if (!CollectionUtils.isEmpty(patterns)) {
+			String pattern = patterns.iterator().next();
+			Map<String, String> vars = getPathMatcher().extractUriTemplateVariables(pattern, lookupDestination);
+			if (!CollectionUtils.isEmpty(vars)) {
+				MessageHeaderAccessor mha = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class);
+				Assert.state(mha != null && mha.isMutable());
+				mha.setHeader(DestinationVariableMethodArgumentResolver.DESTINATION_TEMPLATE_VARIABLES_HEADER, vars);
+			}
 		}
 
 		try {

spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java

@@ -319,7 +319,8 @@ public void setHeader(String name, Object value) {
 
 	protected void verifyType(String headerName, Object headerValue) {
 		if (headerName != null && headerValue != null) {
-			if (MessageHeaders.ERROR_CHANNEL.equals(headerName) || MessageHeaders.REPLY_CHANNEL.endsWith(headerName)) {
+			if (MessageHeaders.ERROR_CHANNEL.equals(headerName) ||
+					MessageHeaders.REPLY_CHANNEL.endsWith(headerName)) {
 				if (!(headerValue instanceof MessageChannel || headerValue instanceof String)) {
 					throw new IllegalArgumentException(
 							"'" + headerName + "' header value must be a MessageChannel or String");
@@ -572,11 +573,13 @@ public static <T extends MessageHeaderAccessor> T getAccessor(Message<?> message
 	 * A variation of {@link #getAccessor(org.springframework.messaging.Message, Class)}
 	 * with a {@code MessageHeaders} instance instead of a {@code Message}.
 	 * <p>This is for cases when a full message may not have been created yet.
-	 * @return an accessor instance of the specified typem or {@code null} if none
+	 * @return an accessor instance of the specified type, or {@code null} if none
 	 * @since 4.1
 	 */
 	@SuppressWarnings("unchecked")
-	public static <T extends MessageHeaderAccessor> T getAccessor(MessageHeaders messageHeaders, Class<T> requiredType) {
+	public static <T extends MessageHeaderAccessor> T getAccessor(
+			MessageHeaders messageHeaders, Class<T> requiredType) {
+
 		if (messageHeaders instanceof MutableMessageHeaders) {
 			MutableMessageHeaders mutableHeaders = (MutableMessageHeaders) messageHeaders;
 			MessageHeaderAccessor headerAccessor = mutableHeaders.getMessageHeaderAccessor();
@@ -593,7 +596,7 @@ public static <T extends MessageHeaderAccessor> T getAccessor(MessageHeaders mes
 	 * wrapping the message with a {@code MessageHeaderAccessor} instance.
 	 * <p>This is for cases where a header needs to be updated in generic code
 	 * while preserving the accessor type for downstream processing.
-	 * @return an accessor of the required type, never {@code null}.
+	 * @return an accessor of the required type (never {@code null})
 	 * @since 4.1
 	 */
 	public static MessageHeaderAccessor getMutableAccessor(Message<?> message) {
@@ -646,7 +649,6 @@ public void setIdAndTimestamp() {
 			if (getId() == null) {
 				IdGenerator idGenerator = (MessageHeaderAccessor.this.idGenerator != null ?
 						MessageHeaderAccessor.this.idGenerator : MessageHeaders.getIdGenerator());
-
 				UUID id = idGenerator.generateId();
 				if (id != null && id != MessageHeaders.ID_VALUE_NONE) {
 					getRawHeaders().put(ID, id);