From 1468f3020481bc4243e46111f4faf8d550085238 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Sun, 7 Aug 2011 18:01:42 +0530
Subject: Modified to prevent ArrayIndexOutOfBoundException in method
 AbstractStatsFactory#addServerStats

---
 .../storage/management/gateway/utils/AbstractStatsFactory.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/com.gluster.storage.management.gateway')

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
index 4953785c..717eca96 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Component;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.ServerStats;
 import com.gluster.storage.management.core.model.ServerStatsRow;
-import com.gluster.storage.management.core.model.Status;
 
 /**
  *
@@ -93,8 +92,8 @@ public abstract class AbstractStatsFactory implements StatsFactory {
 	 */
 	protected List<ServerStatsRow> addServerStats(ServerStats statsToBeAdded, ServerStats targetStats, int[][] dataCount) {
 		List<ServerStatsRow> serverStatsRows = statsToBeAdded.getRows();
-		for (int rowNum = 0; rowNum < serverStatsRows.size()
-				&& rowNum < targetStats.getMetadata().getRowCount(); rowNum++) {
+		for (int rowNum = 0; rowNum < serverStatsRows.size() && rowNum < targetStats.getMetadata().getRowCount()
+				&& rowNum < dataCount.length; rowNum++) {
 			ServerStatsRow row = serverStatsRows.get(rowNum);
 			List<Double> rowData = row.getUsageData();
 			
-- 
cgit