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

[Takuro Okada]

  User: tokada  
  Date: 06/11/10 04:13:11

  Modified:    java/src/expansion/org/jboss/profiler/exp/agent/interceptor   
                        Tag: JBossProfiler_Expansion
                        ServletInterceptor.java JdbcInterceptor.java
                        DriverWrapper.java
  Log:
  Corrected some bugs.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +18 -4     jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/ServletInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServletInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/ServletInterceptor.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- ServletInterceptor.java	26 Oct 2006 08:58:57 -0000	1.1.2.1
  +++ ServletInterceptor.java	10 Nov 2006 09:13:11 -0000	1.1.2.2
  @@ -155,11 +155,25 @@
           if(servletRequest instanceof HttpServletRequest) {
               HttpServletRequest request = (HttpServletRequest)servletRequest;
               Map parameterMap = null;
  -            // Cope with tomcat implementation.
  -            if(request.getMethod()!=null) parameterMap = request.getParameterMap();
  +            try {
  +                parameterMap = request.getParameterMap();
  +            } catch (Throwable e) {
  +                // Copes with tomcat implementation...
  +            }
               if(parameterMap!=null && parameterMap.size()>0) {
  -                parameterExpression = parameterMap.toString();
  -                parameterExpression = parameterExpression.substring(1, parameterExpression.length()-1);
  +                StringBuilder sb = new StringBuilder();
  +                for(Object me : parameterMap.entrySet()) {
  +                    Map.Entry entry = (Map.Entry)me;
  +                    sb.append(entry.getKey());
  +                    sb.append("=");
  +                    String[] values = (String[])entry.getValue();
  +                    for(String value : values) {
  +                        sb.append(value);
  +                        sb.append(",");
  +                    }
  +                    sb.replace(sb.length()-1, sb.length(), " ");
  +                }
  +                parameterExpression = sb.toString();
               }
           }
           collector.setArguments(new Object[]{threadId, null, parameterExpression});
  
  
  
  1.1.2.2   +10 -1     jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/JdbcInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JdbcInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/interceptor/Attic/JdbcInterceptor.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- JdbcInterceptor.java	26 Oct 2006 08:58:57 -0000	1.1.2.1
  +++ JdbcInterceptor.java	10 Nov 2006 09:13:11 -0000	1.1.2.2
  @@ -72,10 +72,19 @@
        */
       public static Object getInstance(Object jdbcObject, DriverWrapper parent) {
           return Proxy.newProxyInstance(jdbcObject.getClass().getClassLoader(), 
  -                                       jdbcObject.getClass().getInterfaces(), 
  +                                       detectImmediateInterface(jdbcObject.getClass()), 
                                          new JdbcInterceptor(jdbcObject, parent));
       }
       
  +    private static Class[] detectImmediateInterface(Class clazz) {
  +        Class[] interfaces = clazz.getInterfaces();
  +        if(interfaces.length==0) {
  +            Class sc = clazz.getSuperclass();
  +            if(sc!=null) interfaces = detectImmediateInterface(sc);
  +        }
  +        return interfaces;
  +    }
  +    
       /**
        * Run profiling by the method invocation.
        */
  
  
  
  1.1.2.2   +1 -1      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.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- DriverWrapper.java	26 Oct 2006 08:58:57 -0000	1.1.2.1
  +++ DriverWrapper.java	10 Nov 2006 09:13:11 -0000	1.1.2.2
  @@ -197,7 +197,7 @@
              method.getName().equals("executeUpdate") ||
              method.getName().equals("prepareStatement") ||
              method.getName().equals("prepareCall")) {
  -            if(args.length>0) {
  +            if(args!=null && args.length>0) {
                   query = (String)args[0];
               }
           }