You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/08 10:09:48 UTC
svn commit: r1672027 - in
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats:
StatisticsManager.java TopicStatisticsImpl.java
Author: cziegeler
Date: Wed Apr 8 08:09:48 2015
New Revision: 1672027
URL: http://svn.apache.org/r1672027
Log:
Add additional null check, relax negative time check
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/TopicStatisticsImpl.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java?rev=1672027&r1=1672026&r2=1672027&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/StatisticsManager.java Wed Apr 8 08:09:48 2015
@@ -143,7 +143,9 @@ public class StatisticsManager implement
if ( event.getTopic().equals(NotificationConstants.TOPIC_JOB_ADDED) ) {
this.globalStatistics.incQueued();
- queueStats.incQueued();
+ if ( queueStats != null ) {
+ queueStats.incQueued();
+ }
} else if ( event.getTopic().equals(NotificationConstants.TOPIC_JOB_CANCELLED) ) {
ts.addCancelled();
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/TopicStatisticsImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/TopicStatisticsImpl.java?rev=1672027&r1=1672026&r2=1672027&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/TopicStatisticsImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/stats/TopicStatisticsImpl.java Wed Apr 8 08:09:48 2015
@@ -57,6 +57,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getTopic()
*/
+ @Override
public String getTopic() {
return this.topic;
}
@@ -64,6 +65,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getNumberOfProcessedJobs()
*/
+ @Override
public synchronized long getNumberOfProcessedJobs() {
return getNumberOfCancelledJobs() + getNumberOfFailedJobs() + getNumberOfFinishedJobs();
}
@@ -71,6 +73,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getAverageWaitingTime()
*/
+ @Override
public synchronized long getAverageWaitingTime() {
return averageWaitingTime;
}
@@ -78,6 +81,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getAverageProcessingTime()
*/
+ @Override
public synchronized long getAverageProcessingTime() {
return averageProcessingTime;
}
@@ -85,6 +89,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getNumberOfFinishedJobs()
*/
+ @Override
public synchronized long getNumberOfFinishedJobs() {
return finishedJobs;
}
@@ -92,6 +97,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getNumberOfCancelledJobs()
*/
+ @Override
public synchronized long getNumberOfCancelledJobs() {
return cancelledJobs;
}
@@ -99,6 +105,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getNumberOfFailedJobs()
*/
+ @Override
public synchronized long getNumberOfFailedJobs() {
return failedJobs;
}
@@ -106,6 +113,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getLastActivatedJobTime()
*/
+ @Override
public synchronized long getLastActivatedJobTime() {
return this.lastActivated;
}
@@ -113,6 +121,7 @@ public class TopicStatisticsImpl impleme
/**
* @see org.apache.sling.event.jobs.TopicStatistics#getLastFinishedJobTime()
*/
+ @Override
public synchronized long getLastFinishedJobTime() {
return this.lastFinished;
}
@@ -124,7 +133,7 @@ public class TopicStatisticsImpl impleme
public synchronized void addFinished(final long jobTime) {
this.finishedJobs++;
this.lastFinished = System.currentTimeMillis();
- if ( jobTime != -1 ) {
+ if ( jobTime > 0 ) {
this.processingTime += jobTime;
this.processingCount++;
this.averageProcessingTime = this.processingTime / this.processingCount;
@@ -137,7 +146,7 @@ public class TopicStatisticsImpl impleme
*/
public synchronized void addActivated(final long queueTime) {
this.lastActivated = System.currentTimeMillis();
- if ( queueTime != -1 ) {
+ if ( queueTime > 0 ) {
this.waitingTime += queueTime;
this.waitingCount++;
this.averageWaitingTime = this.waitingTime / this.waitingCount;