Merge branch 'bugs'

2 files changed, 2 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
index 5de35000..9a456626 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -403,8 +403,6 @@ public class VolumeSummaryView extends ViewPart {
 		guiHelper.setStatusMessage("Setting Cifs Configuration...");
 		parent.update();
 
-		final String cifsUsers = cifsUsersText.getText().trim();
-
 		// To check if no changes in the users list
 		if (!isvalidCifsUser()) {
 			MessageDialog.openError(Display.getDefault().getActiveShell(), "Cifs Configuration",
@@ -419,6 +417,7 @@ public class VolumeSummaryView extends ViewPart {
 				public void run() {
 					VolumesClient vc = new VolumesClient();
 					Volume newVolume = new Volume();
+					String cifsUsers = cifsUsersText.getText().trim();
 					try {
 						vc.setCifsConfig(volume.getName(), cifsCheckbox.getSelection(), cifsUsers);
 						enableCifsUsersControls(false);
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
index 2ce1ea44..65bec003 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
@@ -353,6 +353,7 @@ public class Volume extends Entity {
 		setReplicaCount(newVolume.getReplicaCount());
 		setStripeCount(newVolume.getStripeCount());
 		setNASProtocols(newVolume.getNASProtocols());
+		setCifsUsers(newVolume.getCifsUsers());
 		getOptions().copyFrom(newVolume.getOptions());
 	}
 }
\ No newline at end of file