Fixed Bug 3318 - Deleting multiple volumes simultaneously throws unmarshalling errors

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 8c22c67b..31dff630 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -694,17 +694,16 @@ public class VolumesResource extends AbstractResource {
 	}
 
 	private void postDelete(String volumeName, List<Brick> bricks, boolean deleteFlag) {
-		Status result;
 		for (Brick brick : bricks) {
 			String brickDirectory = brick.getBrickDirectory();
 			// String mountPoint = brickDirectory.substring(0, brickDirectory.lastIndexOf("/"));
 
-			result = (Status) serverUtil.executeScriptOnServer(true, brick.getServerName(),
+			Object output = serverUtil.executeScriptOnServer(true, brick.getServerName(),
 					VOLUME_DIRECTORY_CLEANUP_SCRIPT + " " + brickDirectory + " " + (deleteFlag ? "-d" : ""),
-					Status.class);
-			if (!result.isSuccess()) {
+					String.class);
+			if (output instanceof Status) {
 				throw new GlusterRuntimeException("Error in post-delete operation of volume [" + volumeName + "]: "
-						+ result);
+						+ output);
 			}
 		}
 	}