diff options
2 files changed, 6 insertions, 8 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java index 7de9015d..b96b1ddb 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java @@ -307,7 +307,7 @@ public class GlusterServersResource extends AbstractServersResource { } try { - return glusterUtil.removeServer(onlineServer.getName(), serverName); + status = glusterUtil.removeServer(onlineServer.getName(), serverName); } catch (ConnectionException e) { // online server has gone offline! try with a different one. onlineServer = getNewOnlineServer(clusterName, serverName); diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java index 7ef917bd..05ea58ce 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java @@ -68,8 +68,6 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.StreamingOutput; -import org.springframework.beans.factory.annotation.Autowired; - import com.gluster.storage.management.core.constants.CoreConstants; import com.gluster.storage.management.core.constants.RESTConstants; import com.gluster.storage.management.core.exceptions.ConnectionException; @@ -105,20 +103,20 @@ public class VolumesResource { @InjectParam private GlusterServersResource glusterServersResource; - @Autowired + @InjectParam private ServerUtil serverUtil; - @Autowired + @InjectParam private GlusterUtil glusterUtil; - @Autowired + @InjectParam private ClusterService clusterService; - private FileUtil fileUtil = new FileUtil(); - @InjectParam private VolumeOptionsDefaults volumeOptionsDefaults; + private FileUtil fileUtil = new FileUtil(); + @GET @Produces(MediaType.TEXT_XML) public VolumeListResponse getAllVolumes(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName) { |