Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv31153/src/java/org/logicalcobwebs/proxool
Modified Files:
ConnectionPoolDefinition.java
Log Message:
Fixed bug where connection pool was being recognised as changed even when it wasn't. (This bug introduced after 0.7.2).
Index: ConnectionPoolDefinition.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionPoolDefinition.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ConnectionPoolDefinition.java 20 Oct 2003 11:40:53 -0000 1.27
--- ConnectionPoolDefinition.java 24 Oct 2003 15:22:21 -0000 1.28
***************
*** 254,257 ****
--- 254,263 ----
boolean proxoolProperty = true;
boolean changed = false;
+
+ // These groups of properties have been split off to make this method smaller
+ changed = changed || setHouseKeeperProperty(key, value, pretend);
+ changed = changed || setLoggingProperty(key, value, pretend);
+ changed = changed || setJndiProperty(key, value, pretend);
+
if (key.equals(ProxoolConstants.USER_PROPERTY)) {
proxoolProperty = false;
***************
*** 284,289 ****
}
}
- } else if (setHouseKeeperProperty(key, value, pretend)) {
- changed = true;
} else if (key.equals(ProxoolConstants.MAXIMUM_CONNECTION_COUNT_PROPERTY)) {
if (getMaximumConnectionCount() != getInt(key, value)) {
--- 290,293 ----
***************
*** 348,353 ****
}
}
- } else if (setLoggingProperty(key, value, pretend)) {
- changed = true;
} else if (key.equals(ProxoolConstants.FATAL_SQL_EXCEPTION_PROPERTY)) {
if (isChanged(fatalSqlExceptionsAsString, value)) {
--- 352,355 ----
***************
*** 378,384 ****
}
}
! } else if (setJndiProperty(key, value, pretend)) {
! changed = true;
! } else {
if (isChanged(getDelegateProperty(key), value)) {
changed = true;
--- 380,386 ----
}
}
! }
!
! if (key.startsWith(ProxoolConstants.PROPERTY_PREFIX)) {
if (isChanged(getDelegateProperty(key), value)) {
changed = true;
***************
*** 389,392 ****
--- 391,395 ----
proxoolProperty = false;
}
+
if (changed && !pretend) {
logChange(proxoolProperty, key, value);
***************
*** 1129,1132 ****
--- 1132,1138 ----
Revision history:
$Log$
+ Revision 1.28 2003/10/24 15:22:21 billhorsman
+ Fixed bug where connection pool was being recognised as changed even when it wasn't. (This bug introduced after 0.7.2).
+
Revision 1.27 2003/10/20 11:40:53 billhorsman
Smarter handling of null and empty strings. No NPE during unit tests now.
|
