diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-08-07 18:01:42 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-08-07 18:02:58 +0530 |
| commit | 1468f3020481bc4243e46111f4faf8d550085238 (patch) | |
| tree | 5d0a90121ab5ebcc497e9d7c17907d66aff1b046 /src | |
| parent | 57514f875a16604491ec73c3a8bfbfe6370121bf (diff) | |
Modified to prevent ArrayIndexOutOfBoundException in method AbstractStatsFactory#addServerStats
Diffstat (limited to 'src')
3 files changed, 4 insertions, 6 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java index e1b8f234..6b7af5b0 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java @@ -46,8 +46,7 @@ public class DiscoveredServersClient extends AbstractClient { return RESOURCE_PATH_DISCOVERED_SERVERS; } - @SuppressWarnings("rawtypes") - private Object getDiscoveredServers(Boolean details, Class responseClass) { + private <T> T getDiscoveredServers(Boolean details, Class<T> responseClass) { MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl(); queryParams.putSingle(QUERY_PARAM_DETAILS, details.toString()); return fetchResource(queryParams, responseClass); diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java index cd7639f6..61895c54 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java @@ -444,7 +444,7 @@ public class GlusterDataModelManager { } private void initializeAutoDiscoveredServers(Cluster cluster) { - cluster.setAutoDiscoveredServers(new DiscoveredServersClient(securityToken).getDiscoveredServerDetails()); + cluster.setAutoDiscoveredServers(new DiscoveredServersClient(cluster.getName()).getDiscoveredServerDetails()); } private void initializeVolumes(Cluster cluster) { 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(); |