Author: fhanik
Date: Fri Dec 19 13:45:04 2008
New Revision: 728158
URL: http://svn.apache.org/viewvc?rev=728158&view=rev
Log:
Fix property parsing
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=728158&r1=728157&r2=728158&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Fri Dec 19 13:45:04 2008
@@ -220,12 +220,13 @@
InterceptorDefinition[] definitions = new
InterceptorDefinition[interceptorValues.length];
for (int i=0; i<interceptorValues.length; i++) {
int propIndex = interceptorValues[i].indexOf("(");
- if (propIndex<0) {
+ int endIndex = interceptorValues[i].indexOf(")");
+ if (propIndex<0 || endIndex<0 || endIndex <= propIndex) {
definitions[i] = new
InterceptorDefinition(interceptorValues[i]);
} else {
String name =
interceptorValues[i].substring(0,propIndex);
definitions[i] = new InterceptorDefinition(name);
- String propsAsString =
interceptorValues[i].substring(propIndex+1, interceptorValues[i].length());
+ String propsAsString =
interceptorValues[i].substring(propIndex+1, interceptorValues[i].length()-1);
String[] props = propsAsString.split(",");
for (int j=0; j<props.length; j++) {
int pidx = props[j].indexOf("=");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
