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

[Takuro Okada]

  User: tokada  
  Date: 06/12/13 05:11:42

  Modified:    java/src/expansion/org/jboss/profiler/exp/agent/collector  
                        Tag: JBossProfiler_Expansion
                        ThreadMetricCollector.java CollectorConfig.java
  Log:
  Corrected some bugs.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.4   +9 -1      jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/Attic/ThreadMetricCollector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ThreadMetricCollector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/Attic/ThreadMetricCollector.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -b -r1.1.2.3 -r1.1.2.4
  --- ThreadMetricCollector.java	10 Nov 2006 09:12:25 -0000	1.1.2.3
  +++ ThreadMetricCollector.java	13 Dec 2006 10:11:42 -0000	1.1.2.4
  @@ -22,6 +22,8 @@
   
   package org.jboss.profiler.exp.agent.collector;
   
  +import java.io.Serializable;
  +import java.util.Comparator;
   import java.util.EnumMap;
   import java.util.HashMap;
   import java.util.Map;
  @@ -136,7 +138,7 @@
               }
           }else {
               mmap = new EnumMap<MetricName, Metric>(MetricName.class);
  -            Map<String, Map<MetricName, Metric>> omap = new HierarchicalMap<String, Map<MetricName, Metric>>();
  +            Map<String, Map<MetricName, Metric>> omap = new HierarchicalMap<String, Map<MetricName, Metric>>(new ThreadIdComparator());
               omap.put(String.valueOf(threadId), mmap);
               metricsMap.put(category, omap);
           }
  @@ -216,4 +218,10 @@
           return result;
       }
   
  +    private class ThreadIdComparator implements Comparator<String>, Serializable {
  +        public int compare(String o1, String o2) {
  +            return Long.valueOf(o1).compareTo(Long.valueOf(o2));
  +        }
  +    }
  +
   }
  
  
  
  1.1.2.2   +2 -1      jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/Attic/CollectorConfig.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CollectorConfig.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/collector/Attic/CollectorConfig.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
  --- CollectorConfig.java	10 Nov 2006 09:12:25 -0000	1.1.2.1
  +++ CollectorConfig.java	13 Dec 2006 10:11:42 -0000	1.1.2.2
  @@ -2,6 +2,7 @@
   
   import java.io.IOException;
   import java.io.InputStream;
  +import java.io.Serializable;
   import java.util.Map;
   import java.util.Set;
   
  @@ -14,7 +15,7 @@
   
   import org.apache.log4j.Logger;
   
  -public class CollectorConfig {
  +public class CollectorConfig implements Serializable {
       
       private static Logger logger = Logger.getLogger(CollectorConfig.class);