合并，解决冲突

src/com/platform/entities/Brick.java

@@ -26,6 +26,7 @@ public class Brick {
 	
 	/** volume已使用大小  */
 	private double usedSize;
+
 	/** ip  */
 	private String ip;
 	
@@ -88,4 +89,5 @@ public class Brick {
 		this.path = path;
 	}
 
+	
 }

src/com/platform/glusterfs/GetTreeData.java

@@ -1,4 +1,3 @@
-
 package com.platform.glusterfs;
 
 import java.util.ArrayList;
@@ -6,10 +5,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
+
 import com.platform.entities.FolderNode;
 import com.platform.utils.Constant;
 import com.platform.utils.FileOperateHelper;
-import com.platform.utils.GanymedSSH;
 
 /**
  * <一句话功能简述> 获得GFS某个目录下的子目录
@@ -58,7 +57,6 @@ public class GetTreeData {
 		return fileNode;
 	}
 	
-	
 	/**
 	 * <一句话功能简述> 获得所以子目录
 	 * <功能详细描述>

src/com/platform/glusterfs/SetVolume.java

@@ -114,6 +114,9 @@ public class SetVolume {
 			return -2;
 		}
 		log.info("stop "+volumeName+" successed!");
+		if (null == mountPoints) {
+			return -2;
+		}
 		for(String mountPoint:mountPoints){
 			if (mountPoint != null) {
 				String command = "umount -l " + mountPoint;

src/com/platform/glusterfs/VolumeInfo.java

@@ -129,30 +129,40 @@ public class VolumeInfo {
 			String str[] = line.split(":");
 			volStatus = str[1].replaceAll(" ", "");
 		}
-
 		return volStatus;
 	}
 
 	public Double getVolumeAllSize(String volumeName) {
 		log.info("get volume allSize");
 		Double allSize = null;
-		
+		/*
-		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser,
+		 * ======= // waiting for testing... public Double
-				Constant.rootPasswd, Constant.port, Constant.df + "|grep " + volumeName + "|awk '{print $2}'");
+		 * getVolumeAllSize(String volumeName) { log.info("get volume allSize");
+		 * Double allSize = null;
+		 * 
+		 * >>>>>>> origin/AlexKie String command = "echo \"" +
+		 * Constant.rootPasswd + "\"  |sudo -S df -h|grep " + volumeName +
+		 * "|awk '{print $2}'"; RunCommand runCommand = new RunCommand();
+		 * List<String> reStrings = runCommand.runCommandWait(command); <<<<<<<
+		 * HEAD
+		 */
+		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd,
+				Constant.port, Constant.df + "|grep " + volumeName + "|awk '{print $2}'");
 		// System.out.println(reStrings);
-		if (reStrings == null) {
+		if(reStrings==null){
 			log.error("1801 get result is null");
 			return null;
 		}
-		if (reStrings.size() == 0) {
+		if(reStrings.size()==0){
 			log.error("1802 get result is nothing");
 			return null;
 		}
-		/*
+		char flag = reStrings.get(0).trim().toCharArray()[0];
-		 * char flag = reStrings.get(0).trim().toCharArray()[0]; if (flag < 48
+		if (flag < 48 || flag > 57) {
-		 * || flag > 57) { log.error("1803 get result string wrong"); return
+			log.error("1803 get result string wrong");
-		 * null; }
+			return null;
-		 */
+		}
+
 		for (Iterator it = reStrings.iterator(); it.hasNext();) {
 			String line = (String) it.next();
 			String str[] = line.split("[^0-9]");
@@ -166,7 +176,6 @@ public class VolumeInfo {
 		log.info("get volume used size");
 		Double usedSize = null;
 
-		
 		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser,
 				Constant.rootPasswd, Constant.port, Constant.df + "|grep " + volumeName + "|awk '{print $3}'");
 		// System.out.println(reStrings);

src/com/platform/utils/Constant.java

@@ -29,4 +29,5 @@ public class Constant {
 		 * volume 获取的线程休眠时间
 		 */
 		public final static int update_dataInfo_sleep_time = 3000;
+
 }

src/com/platform/utils/GanymedSSH.java

@@ -62,7 +62,7 @@ public class GanymedSSH {
 		
 		Session sess = null;
 		try {
-			
+			conn = getOpenedConnection(host, username, password, port);
 			sess = conn.openSession();
 			// 执锟斤拷cmd
 			sess.execCommand(cmd);