Trim whitespace from interceptor class names, property names and property values.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@995432 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index e70044c..931ae1c 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -403,16 +403,16 @@ public class PoolProperties implements PoolConfiguration {
                     int propIndex = interceptorValues[i].indexOf("(");
                     int endIndex = interceptorValues[i].indexOf(")");
                     if (propIndex<0 || endIndex<0 || endIndex <= propIndex) {
-                        definitions[i] = new InterceptorDefinition(interceptorValues[i]);
+                        definitions[i] = new InterceptorDefinition(interceptorValues[i].trim());
                     } else {
-                        String name = interceptorValues[i].substring(0,propIndex);
+                        String name = interceptorValues[i].substring(0,propIndex).trim();
                         definitions[i] = new InterceptorDefinition(name);
                         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("=");
-                            String propName = props[j].substring(0,pidx);
-                            String propValue = props[j].substring(pidx+1);
+                            String propName = props[j].substring(0,pidx).trim();
+                            String propValue = props[j].substring(pidx+1).trim();
                             definitions[i].addProperty(new InterceptorProperty(propName,propValue));
                         }
                     }