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

2 files changed, 2 insertions, 3 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
index 2ce23a4e..4c834973 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
@@ -106,7 +106,6 @@ public class ClustersResource extends AbstractResource {
 			return badRequestResponse("Server [" + knownServer + "] is already present in cluster ["
 					+ mappedCluster.getName() + "]!");
 		}
-
 		
 		try {
 			clusterService.registerCluster(clusterName, knownServer);
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java
index 0aabb714..bb379de6 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/services/ClusterService.java
@@ -65,7 +65,7 @@ public class ClusterService {
 	}
 	
 	public ClusterInfo getCluster(String clusterName) {
-		List<ClusterInfo> clusters = clusterDao.findBy("name = ?1", clusterName);
+		List<ClusterInfo> clusters = clusterDao.findBy("UPPER(name) = ?1", clusterName.toUpperCase());
 		if(clusters.size() == 0) {
 			return null;
 		}
@@ -74,7 +74,7 @@ public class ClusterService {
 	}
 	
 	public ClusterInfo getClusterForServer(String serverName) {
-		List<ServerInfo> servers = serverDao.findBy("name = ?1", serverName);
+		List<ServerInfo> servers = serverDao.findBy("UPPER(name) = ?1", serverName.toUpperCase());
 		if(servers.size() == 0) {
 			return null;
 		}