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

[Takuro Okada]

  User: tokada  
  Date: 07/03/07 01:56:33

  Modified:    java/src/expansion/org/jboss/profiler/exp/agent/persistor 
                        Tag: JBossProfiler_Expansion
                        XmlMetricPersistor.java
  Log:
  Correct a bug
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.7   +7 -4      jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/persistor/Attic/XmlMetricPersistor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XmlMetricPersistor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-profiler/java/src/expansion/org/jboss/profiler/exp/agent/persistor/Attic/XmlMetricPersistor.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
  --- XmlMetricPersistor.java	7 Mar 2007 05:14:59 -0000	1.1.2.6
  +++ XmlMetricPersistor.java	7 Mar 2007 06:56:32 -0000	1.1.2.7
  @@ -174,7 +174,8 @@
       public MetricsMap load(Class metricClass, MetricName[] metricNames, Date fromDate, Date toDate) {
           MetricsMap metricsMap = new MetricsMap();
           File dir = new File(persistentPath);
  -        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
  +        SimpleDateFormat dfDate = new SimpleDateFormat("yyyyMMdd");
  +        SimpleDateFormat dfTime = new SimpleDateFormat("yyyyMMdd HHmmss");
           
           // Read the compressed file to byte stream
           for(File file : dir.listFiles()) {
  @@ -182,9 +183,9 @@
               String zipFileName = file.getName();
               zipFileName = zipFileName.substring(0, zipFileName.lastIndexOf('.'));
               try {
  -                Date d = df.parse(zipFileName);
  -                if((fromDate!=null && d.compareTo(roundDate(df, fromDate))<0) ||
  -                   (toDate!=null && d.compareTo(roundDate(df, toDate))>0)) {
  +                Date d = dfDate.parse(zipFileName);
  +                if((fromDate!=null && d.compareTo(roundDate(dfDate, fromDate))<0) ||
  +                   (toDate!=null && d.compareTo(roundDate(dfDate, toDate))>0)) {
                       continue;
                   }
               } catch (Exception e) {
  @@ -202,6 +203,8 @@
                       String fileName = entry.getName();
                       fileName = fileName.substring(0, fileName.lastIndexOf('.'));
                       Date ed = new Date(Long.valueOf(fileName));
  +                    // File datetime is rounded off because input values do not have millisecond precision.
  +                    ed = roundDate(dfTime, ed);
                       if((fromDate!=null && ed.compareTo(fromDate)<0) ||
                           (toDate!=null && ed.compareTo(toDate)>0)) {
                            continue;