[jboss-cvs] jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor ...

[Takuro Okada]

  User: tokada  
  Date: 06/11/28 00:40:11

  Modified:    java/src/expansion/org/jboss/profiler/exp/agent/interceptor  
                        Tag: JBossProfiler_Expansion AopInterceptor.java
                        DriverWrapper.java
  Log:
  
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +19 -4     jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/AopInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AopInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/AopInterceptor.java,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -b -r1.1.2.4 -r1.1.2.5
  --- AopInterceptor.java	28 Nov 2006 02:49:12 -0000	1.1.2.4
  +++ AopInterceptor.java	28 Nov 2006 05:40:11 -0000	1.1.2.5
  @@ -114,15 +114,15 @@
       }
       
       public void setCategory(String category) {
  -        this.category = category;
  +        this.category = trimParameter(category);
       }
       
       public void setProfilerServiceName(String profilerServiceName) {
  -        this.profilerServiceName = profilerServiceName;
  +        this.profilerServiceName = trimParameter(profilerServiceName);
       }
   
       public void setProfilerServiceAddress(String profilerServiceAddress) {
  -        this.profilerServiceAddress = profilerServiceAddress;
  +        this.profilerServiceAddress = trimParameter(profilerServiceAddress);
       }
   
       public void setAsync(boolean async) {
  @@ -130,7 +130,7 @@
       }
       
       public void setCollectorFactoryName(String collectorFactoryName) {
  -        this.collectorFactoryName = collectorFactoryName;
  +        this.collectorFactoryName = trimParameter(collectorFactoryName);
       }
       
       public void setCollectorPoolSize(int collectorPoolSize) {
  @@ -141,6 +141,21 @@
           this.collectorQueueSize = collectorQueueSize;
       }
   
  +    private String trimParameter(String parameter) {
  +        String result = null;
  +        if(parameter==null) return result;
  +        if(parameter.contains("\n")) {
  +            StringBuffer sb = new StringBuffer();
  +            for(String p : parameter.split("\n")) {
  +                sb.append(p.trim());
  +            }
  +            result = sb.toString();
  +        }else {
  +            result = parameter.trim();
  +        }
  +        return result;
  +    }
  +
       /**
        * @see org.jboss.aop.advice.Interceptor#getName()
        */
  
  
  
  1.1.2.7   +3 -0      jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/DriverWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DriverWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/DriverWrapper.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -b -r1.1.2.6 -r1.1.2.7
  --- DriverWrapper.java	28 Nov 2006 02:49:12 -0000	1.1.2.6
  +++ DriverWrapper.java	28 Nov 2006 05:40:11 -0000	1.1.2.7
  @@ -120,6 +120,9 @@
               String filterString = info.getProperty("jboss.profiler.Includes");
               if(filterString!=null) {
                   filters = filterString.split(",");
  +                for(int i=0; i<filters.length; i++) {
  +                    filters[i] = filters[i].trim();
  +                }
               }
               
               String wrappedDriverName = info.getProperty("jboss.profiler.WrappedDriverName");