Polishing (backported from master)

spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -101,7 +101,7 @@ public class TransactionAwareConnectionFactoryProxy
 	 * Set the target ConnectionFactory that this ConnectionFactory should delegate to.
 	 */
 	public final void setTargetConnectionFactory(ConnectionFactory targetConnectionFactory) {
-		Assert.notNull(targetConnectionFactory, "targetConnectionFactory must not be nul");
+		Assert.notNull(targetConnectionFactory, "'targetConnectionFactory' must not be null");
 		this.targetConnectionFactory = targetConnectionFactory;
 	}
 

spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -61,7 +61,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 	 * Return the JMS MessageListener for this endpoint.
 	 */
 	protected MessageListener getMessageListener() {
-		return messageListener;
+		return this.messageListener;
 	}
 
 	/**

spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java

@@ -196,6 +196,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 	@Override
 	public Message toMessage(Object object, Session session, Object conversionHint)
 			throws JMSException, MessageConversionException {
+
 		return toMessage(object, session, getSerializationView(conversionHint));
 	}
 
@@ -234,6 +235,7 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 
 	protected Message toMessage(Object object, Session session, ObjectWriter objectWriter)
 			throws JMSException, MessageConversionException {
+
 		Message message;
 		try {
 			switch (this.targetType) {
@@ -319,8 +321,8 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 	 * @return the resulting message
 	 * @throws JMSException if thrown by JMS methods
 	 * @throws IOException in case of I/O errors
-	 * @see Session#createBytesMessage
 	 * @since 4.3
+	 * @see Session#createBytesMessage
 	 */
 	protected BytesMessage mapToBytesMessage(Object object, Session session, ObjectWriter objectWriter)
 			throws JMSException, IOException {
@@ -400,7 +402,6 @@ public class MappingJackson2MessageConverter implements SmartMessageConverter, B
 		}
 	}
 
-
 	/**
 	 * Convenience method to dispatch to converters for individual message types.
 	 */

spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java

@@ -152,7 +152,4 @@ public class MessagingMessageConverter implements MessageConverter, Initializing
 		return this.headerMapper.toHeaders(message);
 	}
 
-
-
-
 }