diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:20:26 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:20:26 +0530 |
| commit | c2d7de50f8e54c85e53dc8803a8100d6711d1bb1 (patch) | |
| tree | a9a9bf318c02d6b1bc4152b7f63a3e54f91f456c /src/com.gluster.storage.management.core | |
| parent | f9ddc60ee998d24ff1f2b5f158a2b0e14f965b0d (diff) | |
| parent | 45ca89a241e826d80802d9e3e93d28f8cd026316 (diff) | |
Merge branch 'tasks'
Conflicts:
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
Diffstat (limited to 'src/com.gluster.storage.management.core')
2 files changed, 14 insertions, 8 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java index 56b52659..4f6c317c 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java @@ -95,12 +95,8 @@ public class Cluster extends Entity { } public void updateVolume(String volumeName, List<Brick> bricks) { - for (Volume volume : volumes) { - if (volume.getName().equals(volumeName)) { - volume.setBricks(bricks); - return; - } - } + Volume volume = getVolume(volumeName); + volume.setBricks(bricks); } public Cluster(String name, Entity parent) { @@ -165,4 +161,13 @@ public class Cluster extends Entity { } return null; } -}
\ No newline at end of file + + public Volume getVolume(String volumeName) { + for (Volume volume : getVolumes() ) { + if (volume.getName().equals(volumeName)) { + return volume; + } + } + return null; + } +} diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java index 0ab27c35..ba1c4f9f 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java @@ -20,6 +20,7 @@ */ package com.gluster.storage.management.core.response; +import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlElement; @@ -29,7 +30,7 @@ import com.gluster.storage.management.core.model.TaskInfo; @XmlRootElement(name = "tasks") public class TaskInfoListResponse { - private List<TaskInfo> taskInfoList; + private List<TaskInfo> taskInfoList = new ArrayList<TaskInfo>(); public TaskInfoListResponse() { |