Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv631/src/java/org/logicalcobwebs/proxool
Modified Files:
ProxoolDataSource.java
Log Message:
We must setUser and setPassword *after* setDelegateProperties otherwise the values will be overwritten. Credit Bulent Erdemir (bug 1716955)
Index: ProxoolDataSource.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ProxoolDataSource.java 23 May 2006 21:17:55 -0000 1.7
--- ProxoolDataSource.java 15 May 2007 23:10:15 -0000 1.8
***************
*** 121,125 ****
cpd.setMinimumConnectionCount(getMinimumConnectionCount());
cpd.setOverloadWithoutRefusalLifetime(getOverloadWithoutRefusalLifetime());
- cpd.setPassword(getPassword());
cpd.setPrototypeCount(getPrototypeCount());
cpd.setRecentlyStartedThreshold(getRecentlyStartedThreshold());
--- 121,124 ----
***************
*** 129,133 ****
cpd.setTrace(isTrace());
cpd.setUrl(getDriverUrl());
- cpd.setUser(getUser());
cpd.setVerbose(isVerbose());
cpd.setJmx(isJmx());
--- 128,131 ----
***************
*** 136,139 ****
--- 134,141 ----
cpd.setTestBeforeUse(isTestBeforeUse());
cpd.setDelegateProperties(delegateProperties);
+ // We must setUser and setPassword *after* setDelegateProperties
+ // otherwise the values will be overwritten. Credit Bulent Erdemir.
+ cpd.setUser(getUser());
+ cpd.setPassword(getPassword());
ProxoolFacade.registerConnectionPool(cpd);
}
***************
*** 684,687 ****
--- 686,692 ----
Revision history:
$Log$
+ Revision 1.8 2007/05/15 23:10:15 billhorsman
+ We must setUser and setPassword *after* setDelegateProperties otherwise the values will be overwritten. Credit Bulent Erdemir (bug 1716955)
+
Revision 1.7 2006/05/23 21:17:55 billhorsman
Add in maximum-active-time. Credit to Paolo Di Tommaso.
|
