Merge branch 'master' of github.com:anjalshireesh/console

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
index 45287599..543671d6 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
@@ -147,6 +147,20 @@ public class VolumeOptionsPage extends Composite {
 			}
 		});
 		
+		parent.addDisposeListener(new DisposeListener() {
+			
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				if(!addButton.isEnabled()) {
+					// user has selected key, but not added value. Since this is not a valid entry,
+					// remove the last option (without value) from the volume
+					Entry<String, String> entryBeingAdded = keyEditingSupport.getEntryBeingAdded();
+					volume.getOptions().remove(entryBeingAdded.getKey());
+				}
+			}
+		});
+
+		
 		clusterListener = new DefaultClusterListener() {
 			@SuppressWarnings("unchecked")
 			@Override