diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java
index 361f047de7..587d857de5 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/AbstractPersistentAcceptOnceFileListFilter.java
@@ -80,11 +80,9 @@ public abstract class AbstractPersistentAcceptOnceFileListFilter<F> extends Abst
 				return true;
 			}
 			// same value in store
-			if (!isEqual(file, oldValue)) {
-				if (this.store.replace(key, oldValue, newValue)) {
-					flushIfNeeded();
-					return true;
-				}
+			if (!isEqual(file, oldValue) && this.store.replace(key, oldValue, newValue)) {
+				flushIfNeeded();
+				return true;
 			}
 			return false;
 		}
diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java
index 3d93b1a579..5989ad6784 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java
@@ -31,7 +31,7 @@ import org.springframework.integration.mapping.HeaderMapper;
  */
 public abstract class JmsHeaderMapper implements HeaderMapper<Message> {
 
-	String CONTENT_TYPE_PROPERTY = "content_type";
+	protected final static String CONTENT_TYPE_PROPERTY = "content_type";
 
 }
 
diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java
index 429a46c484..595e3eb911 100644
--- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java
+++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/XmppContextUtils.java
@@ -23,11 +23,10 @@ package org.springframework.integration.xmpp.core;
  */
 public final class XmppContextUtils {
 
+	public static final String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
 
 	private XmppContextUtils() {
 		super();
 	}
 
-	public static String XMPP_CONNECTION_BEAN_NAME = "xmppConnection";
-
 }