diff options
| author | Selvam <selvam@gluster.com> | 2011-04-15 16:44:24 +0530 |
|---|---|---|
| committer | Selvam <selvam@gluster.com> | 2011-04-15 16:44:24 +0530 |
| commit | 2df2dc9938b4e70a2446e184b8ac7eb89ca086c0 (patch) | |
| tree | 107570fb0213d379e1703bcad912644b99729725 | |
| parent | 682b389888fdbaa38a50b76c44068f6dc6adfadd (diff) | |
| parent | 7e6efca549922972ab18074af8337b5105f0cfcd (diff) | |
Merge branch 'volume-property'
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
| -rw-r--r-- | src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java index 9a9321bd..d837c8a4 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java @@ -96,8 +96,8 @@ public class VolumeSummaryView extends ViewPart { List<Alert> alerts = GlusterDataModelManager.getInstance().getModel().getCluster().getAlerts(); for (int i = 0; i < alerts.size(); i++) { - if (alerts.get(i).getReference().split(":")[0].trim().equals(volume.getName()) - && alerts.get(i).getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT) { + if (alerts.get(i).getType() == Alert.ALERT_TYPES.OFFLINE_VOLUME_DISKS_ALERT + && alerts.get(i).getReference().split(":")[0].trim().equals(volume.getName())) { addAlertLabel(section, alerts.get(i)); } } |