[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ConnectionPoolDefinition.java,1.26,1.27

[<bil...@us...>]

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv11251

Modified Files:
	ConnectionPoolDefinition.java 
Log Message:
Smarter handling of null and empty strings. No NPE during unit tests now.

Index: ConnectionPoolDefinition.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionPoolDefinition.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ConnectionPoolDefinition.java	19 Oct 2003 13:31:57 -0000	1.26
--- ConnectionPoolDefinition.java	20 Oct 2003 11:40:53 -0000	1.27
***************
*** 223,232 ****
                  String key = (String) i.next();
                  String value = info.getProperty(key);
-                 // This allows us to set properties to a null, even though Properties
-                 // object doesn't allow null values. It means that you can't set a property
-                 // to be a zero length string but that's ok.
-                 if (value != null && value.length() == 0) {
-                     value = null;
-                 }
                  changed = changed | setAnyProperty(key, value, pretend);
                  if (!pretend) {
--- 223,226 ----
***************
*** 360,364 ****
                  changed = true;
                  if (!pretend) {
!                     setFatalSqlExceptionsAsString(value);
                  }
              }
--- 354,358 ----
                  changed = true;
                  if (!pretend) {
!                     setFatalSqlExceptionsAsString(value.length() > 0 ? value : null);
                  }
              }
***************
*** 367,371 ****
                  changed = true;
                  if (!pretend) {
!                     setFatalSqlExceptionWrapper(value);
                  }
              }
--- 361,365 ----
                  changed = true;
                  if (!pretend) {
!                     setFatalSqlExceptionWrapper(value.length() > 0 ? value : null);
                  }
              }
***************
*** 374,378 ****
                  changed = true;
                  if (!pretend) {
!                     setStatistics(value);
                  }
              }
--- 368,372 ----
                  changed = true;
                  if (!pretend) {
!                     setStatistics(value.length() > 0 ? value : null);
                  }
              }
***************
*** 381,385 ****
                  changed = true;
                  if (!pretend) {
!                     setStatisticsLogLevel(value);
                  }
              }
--- 375,379 ----
                  changed = true;
                  if (!pretend) {
!                     setStatisticsLogLevel(value.length() > 0 ? value : null);
                  }
              }
***************
*** 463,467 ****
                  changed = true;
                  if (!pretend) {
!                     setHouseKeepingTestSql(value);
                  }
              }
--- 457,461 ----
                  changed = true;
                  if (!pretend) {
!                     setHouseKeepingTestSql(value.length() > 0 ? value : null);
                  }
              }
***************
*** 496,500 ****
                  changed = true;
                  if (!pretend) {
!                     setJndiName(value);
                  }
              }
--- 490,494 ----
                  changed = true;
                  if (!pretend) {
!                     setJndiName(value.length() > 0 ? value : null);
                  }
              }
***************
*** 503,507 ****
                  changed = true;
                  if (!pretend) {
!                     setInitialContextFactory(value);
                  }
              }
--- 497,501 ----
                  changed = true;
                  if (!pretend) {
!                     setInitialContextFactory(value.length() > 0 ? value : null);
                  }
              }
***************
*** 510,514 ****
                  changed = true;
                  if (!pretend) {
!                     setProviderUrl(value);
                  }
              }
--- 504,508 ----
                  changed = true;
                  if (!pretend) {
!                     setProviderUrl(value.length() > 0 ? value : null);
                  }
              }
***************
*** 517,521 ****
                  changed = true;
                  if (!pretend) {
!                     setSecurityAuthentication(value);
                  }
              }
--- 511,515 ----
                  changed = true;
                  if (!pretend) {
!                     setSecurityAuthentication(value.length() > 0 ? value : null);
                  }
              }
***************
*** 524,528 ****
                  changed = true;
                  if (!pretend) {
!                     setSecurityPrincipal(value);
                  }
              }
--- 518,522 ----
                  changed = true;
                  if (!pretend) {
!                     setSecurityPrincipal(value.length() > 0 ? value : null);
                  }
              }
***************
*** 531,535 ****
                  changed = true;
                  if (!pretend) {
!                     setSecurityCredentials(value);
                  }
              }
--- 525,529 ----
                  changed = true;
                  if (!pretend) {
!                     setSecurityCredentials(value.length() > 0 ? value : null);
                  }
              }
***************
*** 1135,1138 ****
--- 1129,1135 ----
   Revision history:
   $Log$
+  Revision 1.27  2003/10/20 11:40:53  billhorsman
+  Smarter handling of null and empty strings. No NPE during unit tests now.
+ 
   Revision 1.26  2003/10/19 13:31:57  billhorsman
   Setting a property to a zero length String actually sets it to a null