LPS-108285 SF

g-vijayvergia · Feb 25, 2020 · fd919f0 · fd919f0
1 parent 7630efd
commit fd919f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/...ava/com/liferay/portal/monitoring/internal/statistics/portal/ServerSummaryStatistics.java b/...ava/com/liferay/portal/monitoring/internal/statistics/portal/ServerSummaryStatistics.java
@@ -36,23 +36,23 @@ public class ServerSummaryStatistics implements SummaryStatistics {
 
 	@Override
 	public long getAverageTime() {
-		long averageTime = 0;
-
 		Set<CompanyStatistics> companyStatisticsSet =
 			_serverStatistics.getCompanyStatisticsSet();
 
+		if (companyStatisticsSet.isEmpty()) {
+			return 0;
+		}
+
+		long averageTime = 0;
+
 		for (CompanyStatistics companyStatistics : companyStatisticsSet) {
 			RequestStatistics requestStatistics =
 				companyStatistics.getRequestStatistics();
 
 			averageTime += requestStatistics.getAverageTime();
 		}
 
-		if (!companyStatisticsSet.isEmpty()) {
-			return averageTime / companyStatisticsSet.size();
-		}
-
-		return averageTime;
+		return averageTime / companyStatisticsSet.size();
 	}
 
 	@Override

diff --git a/...liferay/portal/monitoring/internal/statistics/portlet/ActionRequestSummaryStatistics.java b/...liferay/portal/monitoring/internal/statistics/portlet/ActionRequestSummaryStatistics.java
@@ -55,7 +55,7 @@ public long getAverageTime() {
 			return averageTime / count;
 		}
 
-		return averageTime;
+		return 0;
 	}
 
 	@Override

diff --git a/.../liferay/portal/monitoring/internal/statistics/portlet/EventRequestSummaryStatistics.java b/.../liferay/portal/monitoring/internal/statistics/portlet/EventRequestSummaryStatistics.java
@@ -54,7 +54,7 @@ public long getAverageTime() {
 			return averageTime / count;
 		}
 
-		return averageTime;
+		return 0;
 	}
 
 	@Override

diff --git a/...liferay/portal/monitoring/internal/statistics/portlet/RenderRequestSummaryStatistics.java b/...liferay/portal/monitoring/internal/statistics/portlet/RenderRequestSummaryStatistics.java
@@ -55,7 +55,7 @@ public long getAverageTime() {
 			return averageTime / count;
 		}
 
-		return averageTime;
+		return 0;
 	}
 
 	@Override

diff --git a/...feray/portal/monitoring/internal/statistics/portlet/ResourceRequestSummaryStatistics.java b/...feray/portal/monitoring/internal/statistics/portlet/ResourceRequestSummaryStatistics.java
@@ -55,7 +55,7 @@ public long getAverageTime() {
 			return averageTime / count;
 		}
 
-		return averageTime;
+		return 0;
 	}
 
 	@Override