Merge pull request #446 from tomjenkinson/JBTM-1938-master

JBTM-1938 do not cache the reference to the datasource to provide compat...

ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/jdbc/accessors/DataSourceJDBCAccess.java

@@ -44,10 +44,16 @@
 
 public class DataSourceJDBCAccess implements JDBCAccess {
 
-	private DataSource dataSource;
 	private String datasourceName;
+	private InitialContext context;
 
 	public Connection getConnection() throws SQLException {
+		DataSource dataSource;
+		try {
+			dataSource = (DataSource) context.lookup(datasourceName);
+		} catch (NamingException ex) {
+			throw new FatalError(toString() + " : " + ex, ex);
+		}
 		Connection connection = dataSource.getConnection();
 		connection.setAutoCommit(false);
 		return connection;
@@ -71,8 +77,7 @@ public void initialise(StringTokenizer tokenizer) {
 		}
 
 		try {
-			InitialContext context = new InitialContext();
-			dataSource = (DataSource) context.lookup(datasourceName);
+			context = new InitialContext();
 		} catch (NamingException ex) {
 			throw new FatalError(toString() + " : " + ex, ex);
 		}