View | Details | Raw Unified | Return to bug 53374
Collapse All | Expand All

(-)main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (-1 / +9 lines)
Lines 113-119 Link Here
113
113
114
    protected static final String PROP_ALTERNATE_USERNAME_ALLOWED = "alternateUsernameAllowed";
114
    protected static final String PROP_ALTERNATE_USERNAME_ALLOWED = "alternateUsernameAllowed";
115
115
116
    protected static final String PROP_COMMIT_ON_RETURN = "commitOnReturn";
116
117
118
117
    public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
119
    public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
118
120
119
    public static final String OBJECT_NAME = "object_name";
121
    public static final String OBJECT_NAME = "object_name";
Lines 162-168 Link Here
162
        PROP_DATASOURCE,
164
        PROP_DATASOURCE,
163
        PROP_DATASOURCE_JNDI,
165
        PROP_DATASOURCE_JNDI,
164
        PROP_SUSPECT_TIMEOUT,
166
        PROP_SUSPECT_TIMEOUT,
165
        PROP_ALTERNATE_USERNAME_ALLOWED
167
        PROP_ALTERNATE_USERNAME_ALLOWED,
168
        PROP_COMMIT_ON_RETURN
166
    };
169
    };
167
170
168
    // -------------------------------------------------- ObjectFactory Methods
171
    // -------------------------------------------------- ObjectFactory Methods
Lines 476-481 Link Here
476
            poolProperties.setAlternateUsernameAllowed(Boolean.parseBoolean(value));
479
            poolProperties.setAlternateUsernameAllowed(Boolean.parseBoolean(value));
477
        }
480
        }
478
481
482
        value = properties.getProperty(PROP_COMMIT_ON_RETURN);
483
        if (value != null) {
484
            poolProperties.setCommitOnReturn(Boolean.parseBoolean(value));
485
        }
486
479
        return poolProperties;
487
        return poolProperties;
480
    }
488
    }
481
489

Return to bug 53374