Merge branch 'master' of git@github.com:gluster/console

3 files changed, 10 insertions, 5 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java
index 2da8d68e..8d1760fd 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java
@@ -45,7 +45,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 			return glusterInterface;
 		}
 		
-		glusterInterface = new Gluster323InterfaceService();
+		glusterInterface = serverUtil.getBean(Gluster323InterfaceService.class);
 		glusterInterfaces.put(glusterFsVersion, glusterInterface);
 		return glusterInterface;
 	}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 1fba4158..4c437737 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -26,13 +26,12 @@ import org.springframework.web.context.ContextLoader;
 import com.gluster.storage.management.core.constants.GlusterConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.model.InitDiskStatusResponse;
+import com.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
 import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 import com.gluster.storage.management.core.model.TaskStatus;
 import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
 import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
@@ -45,7 +44,6 @@ public class InitializeDiskTask extends Task {
 	private String diskName;
 	private String fsType;
 	private ServerUtil serverUtil;
-	private GlusterInterfaceService glusterUtil;
 
 	public InitializeDiskTask(ClusterService clusterService, String clusterName, String serverName, String diskName,
 			String fsType) {
@@ -67,7 +65,6 @@ public class InitializeDiskTask extends Task {
 
 	private void init() {
 		ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
-		glusterUtil = ctx.getBean(GlusterInterfaceService.class);
 		serverUtil = ctx.getBean(ServerUtil.class);
 	}
 	
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
index 7211a086..0d09d616 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -34,7 +34,9 @@ import javax.xml.bind.Unmarshaller;
 
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.ContextLoader;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
@@ -44,6 +46,7 @@ import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.ProcessUtil;
+import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
 
 @Component
 public class ServerUtil {
@@ -352,4 +355,9 @@ public class ServerUtil {
 	public Status getDiskForDir(String serverName, String brickDir) {
 		return executeScriptOnServer(serverName, REMOTE_SCRIPT_GET_DISK_FOR_DIR + " " + brickDir, Status.class);
 	}
+	
+	public <T> T getBean(Class<T> clazz) {
+		ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
+		return ctx.getBean(clazz);
+	}
 }