[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ProxoolDataSource.java, 1.9, 1.10

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

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24017/src/java/org/logicalcobwebs/proxool

Modified Files:
	ProxoolDataSource.java 
Log Message:
Allow a blank string to be a valid value for a delegate property

Index: ProxoolDataSource.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ProxoolDataSource.java	19 Jun 2007 11:33:35 -0000	1.9
--- ProxoolDataSource.java	14 Dec 2007 13:49:39 -0000	1.10
***************
*** 522,529 ****
          while (stOuter.hasMoreTokens()) {
              StringTokenizer stInner = new StringTokenizer(stOuter.nextToken(), "=");
!             if (stInner.countTokens() != 2) {
                  throw new IllegalArgumentException("Unexpected delegateProperties value: '" + properties + "'. Expected 'name=value'");
              }
-             delegateProperties.put(stInner.nextToken().trim(), stInner.nextToken().trim());
          }
      }
--- 522,533 ----
          while (stOuter.hasMoreTokens()) {
              StringTokenizer stInner = new StringTokenizer(stOuter.nextToken(), "=");
!             if (stInner.countTokens() == 1) {
!                 // Allow blank string to be a valid value
!                 delegateProperties.put(stInner.nextToken().trim(), "");
!             } else if (stInner.countTokens() == 2) {
!                 delegateProperties.put(stInner.nextToken().trim(), stInner.nextToken().trim());
!             } else {
                  throw new IllegalArgumentException("Unexpected delegateProperties value: '" + properties + "'. Expected 'name=value'");
              }
          }
      }
***************
*** 686,689 ****
--- 690,696 ----
   Revision history:
   $Log$
+  Revision 1.10  2007/12/14 13:49:39  billhorsman
+  Allow a blank string to be a valid value for a delegate property
+ 
   Revision 1.9  2007/06/19 11:33:35  billhorsman
   Changed time (millisecond) properties from int to long: maximumConnectionLifetime, houseKeepingSleepTime, recentlyStartedThreshold, overloadWithoutRefusalLifetime, maximumActiveTime