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

4 files changed, 28 insertions, 6 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
index 2a4a9920..355483e7 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
@@ -52,4 +52,6 @@ public interface ClusterListener {
 	public void alertRemoved(Alert alert);
 	
 	public void alertUpdated(Alert alert);
+	
+	public void aggregatedStatsChanged();
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
index e72ff3e5..6a3c5dae 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
@@ -110,4 +110,9 @@ public class DefaultClusterListener implements ClusterListener {
 	public void alertUpdated(Alert alert) {
 		modelChanged();
 	}
+
+	@Override
+	public void aggregatedStatsChanged() {
+		modelChanged();
+	}
 }
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 9255414c..f224bd5a 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
@@ -189,6 +189,16 @@ public class Volume extends Entity {
 	public void setAccessControlList(String accessControlList) {
 		setOption(OPTION_AUTH_ALLOW, accessControlList);
 	}
+	
+	@XmlTransient
+	public boolean isNfsEnabled() {
+		String nfsDisabled = options.get(OPTION_NFS_DISABLE);
+		if(nfsDisabled == null || nfsDisabled.equalsIgnoreCase(GlusterConstants.ON)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
 	@XmlElement(name="options")
 	public VolumeOptions getOptions() {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
index d10dfee5..a0d90634 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
@@ -39,12 +39,17 @@ public class FileUtil {
 		}
 	}
 
-	public static byte[] readFileAsByteArray(File file) throws FileNotFoundException, IOException {
-		FileInputStream fileInputStream = new FileInputStream(file);
-		byte[] data = new byte[fileInputStream.available()];
-		fileInputStream.read(data);
-		fileInputStream.close();
-		return data;
+	public static byte[] readFileAsByteArray(File file) {
+		try {
+			FileInputStream fileInputStream = new FileInputStream(file);
+			byte[] data = new byte[fileInputStream.available()];
+			fileInputStream.read(data);
+			fileInputStream.close();
+			return data;
+		} catch (Exception e) {
+			throw new GlusterRuntimeException("Exception while reading file [" + file.getName() + "]: "
+					+ e.getMessage(), e);
+		}
 	}
 	
 	public static void createTextFile(String fileName, String contents) {