svn commit: r758168 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics: StatisticsCleaner.java StatisticsReporter.java

[indika]

Author: indika
Date: Wed Mar 25 07:57:33 2009
New Revision: 758168

URL: http://svn.apache.org/viewvc?rev=758168&view=rev
Log:
fix an issue with reporting stats for fault response and stat cleaning

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsCleaner.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsCleaner.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsCleaner.java?rev=758168&r1=758167&r2=758168&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsCleaner.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsCleaner.java
 Wed Mar 25 07:57:33 2009
@@ -35,7 +35,7 @@
 
     private StatisticsCollector collector;
     private long cleanInterval;
-    private long nextTime;
+    private long nextTime = -1;
     private boolean isCleanEnable = true;
 
     public StatisticsCleaner(StatisticsCollector collector) {
@@ -76,6 +76,10 @@
             }
 
             long currentTime = System.currentTimeMillis();
+            if (nextTime == -1) {
+                nextTime = currentTime + cleanInterval;
+            }
+            
             if (nextTime <= currentTime) {
                 collector.clearStatistics();
                 nextTime = currentTime + cleanInterval;
@@ -84,7 +88,6 @@
                     log.debug("There are no expired statistics to be 
cleaned.");
                 }
             }
-
         } catch (Throwable ignored) {
         }
     }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java?rev=758168&r1=758167&r2=758168&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/StatisticsReporter.java
 Wed Mar 25 07:57:33 2009
@@ -91,6 +91,9 @@
             if (log.isDebugEnabled()) {
                 log.debug("Reporting a fault : " + statisticsRecord);
             }
+            statisticsRecord.collect(
+                    new AspectConfiguration(SynapseConstants.SYNAPSE_ASPECTS),
+                    ComponentType.ANY, true);
             statisticsRecord.setFaultResponse(true);
         }
     }