Shouldn't we have a unit test that validates the expected names to avoid this type of issue?
Gary On Wed, Mar 8, 2023 at 8:18 AM <ma...@apache.org> wrote: > > This is an automated email from the ASF dual-hosted git repository. > > markt pushed a commit to branch master > in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git > > > The following commit(s) were added to refs/heads/master by this push: > new b1e0c86d Correct a regression introduced in d69e6a5 > b1e0c86d is described below > > commit b1e0c86d101aa43029625eb191aaee4306911702 > Author: Mark Thomas <ma...@apache.org> > AuthorDate: Wed Mar 8 13:17:58 2023 +0000 > > Correct a regression introduced in d69e6a5 > > Can't change the public name of configuration property in a point > release. > --- > .../java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 4 > ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java > b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java > index 6f56f645..1c7ee353 100644 > --- > a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java > +++ > b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java > @@ -288,7 +288,7 @@ public class DriverAdapterCPDS implements > ConnectionPoolDataSource, Referenceabl > if (isNotEmpty(ra)) { > setDriver(getStringContent(ra)); > } > - ra = ref.get("connectionString"); > + ra = ref.get("url"); > if (isNotEmpty(ra)) { > setUrl(getStringContent(ra)); > } > @@ -449,7 +449,7 @@ public class DriverAdapterCPDS implements > ConnectionPoolDataSource, Referenceabl > ref.add(new StringRefAddr("loginTimeout", > String.valueOf(getLoginTimeout()))); > ref.add(new StringRefAddr(Constants.KEY_PASSWORD, getPassword())); > ref.add(new StringRefAddr(Constants.KEY_USER, getUser())); > - ref.add(new StringRefAddr("connectionString", getUrl())); > + ref.add(new StringRefAddr("url", getUrl())); > > ref.add(new StringRefAddr("poolPreparedStatements", > String.valueOf(isPoolPreparedStatements()))); > ref.add(new StringRefAddr("maxIdle", String.valueOf(getMaxIdle()))); > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
