Polishing

spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java

@@ -165,6 +165,7 @@ public class MessageHeaders implements Map<String, Object>, Serializable {
 		return get(ERROR_CHANNEL);
 	}
 
+
 	@SuppressWarnings("unchecked")
 	public <T> T get(Object key, Class<T> type) {
 		Object value = this.headers.get(key);
@@ -179,23 +180,6 @@ public class MessageHeaders implements Map<String, Object>, Serializable {
 	}
 
 
-	@Override
-	public boolean equals(Object other) {
-		return (this == other ||
-				(other instanceof MessageHeaders && this.headers.equals(((MessageHeaders) other).headers)));
-	}
-
-	@Override
-	public int hashCode() {
-		return this.headers.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return this.headers.toString();
-	}
-
-
 	// Delegating Map implementation
 
 	public boolean containsKey(Object key) {
@@ -275,11 +259,13 @@ public class MessageHeaders implements Map<String, Object>, Serializable {
 				keysToRemove.add(entry.getKey());
 			}
 		}
-		for (String key : keysToRemove) {
-			if (logger.isInfoEnabled()) {
-				logger.info("Removing non-serializable header: " + key);
+		if (!keysToRemove.isEmpty()) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Removing non-serializable message headers: " + keysToRemove);
+			}
+			for (String key : keysToRemove) {
+				this.headers.remove(key);
 			}
-			this.headers.remove(key);
 		}
 		out.defaultWriteObject();
 	}
@@ -288,4 +274,23 @@ public class MessageHeaders implements Map<String, Object>, Serializable {
 		in.defaultReadObject();
 	}
 
+
+	// equals, hashCode, toString
+
+	@Override
+	public boolean equals(Object other) {
+		return (this == other ||
+				(other instanceof MessageHeaders && this.headers.equals(((MessageHeaders) other).headers)));
+	}
+
+	@Override
+	public int hashCode() {
+		return this.headers.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return this.headers.toString();
+	}
+
 }