--- main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (revision 1306946) +++ main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (working copy) @@ -113,7 +113,9 @@ protected static final String PROP_ALTERNATE_USERNAME_ALLOWED = "alternateUsernameAllowed"; + protected static final String PROP_COMMIT_ON_RETURN = "commitOnReturn"; + public static final int UNKNOWN_TRANSACTIONISOLATION = -1; public static final String OBJECT_NAME = "object_name"; @@ -162,7 +164,8 @@ PROP_DATASOURCE, PROP_DATASOURCE_JNDI, PROP_SUSPECT_TIMEOUT, - PROP_ALTERNATE_USERNAME_ALLOWED + PROP_ALTERNATE_USERNAME_ALLOWED, + PROP_COMMIT_ON_RETURN }; // -------------------------------------------------- ObjectFactory Methods @@ -476,6 +479,11 @@ poolProperties.setAlternateUsernameAllowed(Boolean.parseBoolean(value)); } + value = properties.getProperty(PROP_COMMIT_ON_RETURN); + if (value != null) { + poolProperties.setCommitOnReturn(Boolean.parseBoolean(value)); + } + return poolProperties; }