diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-28 14:54:28 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-28 14:54:28 +0530 |
| commit | 059b1ae9ccdd3d69f3dab5213fe81fb62a6c1b5f (patch) | |
| tree | c171b150e325055ef2ba592ff5e0d82726c9dbe7 /src | |
| parent | afe08a10dd08daa116e6002b3f34cc9a055455ca (diff) | |
| parent | 2e78f308846a4318a4e124fe7cbdcb7da5cc3fb5 (diff) | |
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src')
2 files changed, 9 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java index e19645a5..017549de 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java @@ -668,11 +668,13 @@ public class GlusterDataModelManager { listener.serverRemoved(server); } - // add it to discovered servers list - Server removedServer = new Server(); - removedServer.copyFrom(server); - removedServer.addDisks(server.getDisks()); - addDiscoveredServer(removedServer); + // add it to discovered servers list if it is online server + if (server.isOnline()) { + Server removedServer = new Server(); + removedServer.copyFrom(server); + removedServer.addDisks(server.getDisks()); + addDiscoveredServer(removedServer); + } } public void deleteVolume(Volume volume) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java index 69434e96..d8b8387e 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java @@ -139,6 +139,8 @@ public class VolumeOptionsPage extends Composite { switch (event.getEventType()) { case VOLUME_OPTIONS_RESET: if (!tableViewer.getControl().isDisposed()) { + //While reseting the options, clear the filter text before refreshing the tree + filterText.setText(""); tableViewer.refresh(); setAddButtonsEnabled(true); } |