From feed13da974c8f7833833b4258a8b63e8a69bef7 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 17 May 2011 14:46:41 -0400
Subject: [PATCH] INT-1865 polishing, made attributes 'volatile'

---
 .../BeanPropertySqlParameterSourceFactory.java     |  2 +-
 ...ressionEvaluatingSqlParameterSourceFactory.java |  6 +++---
 .../integration/jdbc/JdbcMessageHandler.java       |  2 +-
 .../integration/jdbc/JdbcMessageStore.java         | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java
index 4573bf7d5e..c5a51db28c 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/BeanPropertySqlParameterSourceFactory.java
@@ -30,7 +30,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  */
 public class BeanPropertySqlParameterSourceFactory implements SqlParameterSourceFactory {
 
-	private Map<String, Object> staticParameters;
+	private volatile Map<String, Object> staticParameters;
 
 	public BeanPropertySqlParameterSourceFactory() {
 		this.staticParameters = Collections.unmodifiableMap(new HashMap<String, Object>());
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java
index 864aa930fb..bceec60c0b 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactory.java
@@ -41,9 +41,9 @@ public class ExpressionEvaluatingSqlParameterSourceFactory extends AbstractExpre
 
 	private static final Object ERROR = new Object();
 
-	private Map<String, ?> staticParameters;
+	private volatile Map<String, ?> staticParameters;
 
-	private Map<String, String> parameterExpressions;
+	private volatile Map<String, String> parameterExpressions;
 
 	public ExpressionEvaluatingSqlParameterSourceFactory() {
 		this.staticParameters = Collections.unmodifiableMap(new HashMap<String, Object>());
@@ -109,7 +109,7 @@ public class ExpressionEvaluatingSqlParameterSourceFactory extends AbstractExpre
 
 		private final Object input;
 
-		private Map<String, Object> values = new HashMap<String, Object>();
+		private volatile Map<String, Object> values = new HashMap<String, Object>();
 
 		private final Map<String, String> parameterExpressions;
 
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java
index 8ffdb3f700..f3be394a61 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java
@@ -56,7 +56,7 @@ public class JdbcMessageHandler extends AbstractMessageHandler {
 
 	private volatile SqlParameterSourceFactory sqlParameterSourceFactory = new BeanPropertySqlParameterSourceFactory();
 
-	private boolean keysGenerated;
+	private volatile boolean keysGenerated;
 
 	/**
 	 * Constructor taking {@link DataSource} from which the DB Connection can be obtained and the select query to
diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
index 48becc9884..4adba94308 100644
--- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
+++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
@@ -114,19 +114,19 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	 */
 	public static final String CREATED_DATE_KEY = JdbcMessageStore.class.getSimpleName() + ".CREATED_DATE";
 
-	private String region = "DEFAULT";
+	private volatile String region = "DEFAULT";
 
-	private String tablePrefix = DEFAULT_TABLE_PREFIX;
+	private volatile String tablePrefix = DEFAULT_TABLE_PREFIX;
 
-	private JdbcOperations jdbcTemplate;
+	private volatile JdbcOperations jdbcTemplate;
 
-	private DeserializingConverter deserializer;
+	private volatile DeserializingConverter deserializer;
 
-	private SerializingConverter serializer;
+	private volatile SerializingConverter serializer;
 
-	private LobHandler lobHandler = new DefaultLobHandler();
+	private volatile LobHandler lobHandler = new DefaultLobHandler();
 
-	private MessageMapper mapper = new MessageMapper();
+	private volatile MessageMapper mapper = new MessageMapper();
 
 	/**
 	 * Convenient constructor for configuration use.