diff options
3 files changed, 12 insertions, 23 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java index c23a96c5..487a03c4 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java @@ -254,31 +254,21 @@ public class LoginDialog extends Dialog { super.okPressed(); } catch (Exception e) { setReturnCode(RETURN_CODE_ERROR); - MessageDialog.openError(getShell(), "Initialization Error", e.getMessage()); - close(); + MessageDialog.openError(getShell(), "Gluster Management Console", e.getMessage()); } } public void createOrRegisterCluster(ClustersClient clustersClient, String clusterName, String serverName, CLUSTER_MODE mode) { - String errTitle = null; - - try { - switch (mode) { - case SELECT: - return; - case CREATE: - errTitle = "Cluster Creation Failed!"; - clustersClient.createCluster(clusterName); - break; - case REGISTER: - errTitle = "Cluster Registration Failed!"; - clustersClient.registerCluster(clusterName, serverName); - break; - } - } catch (Exception e) { - MessageDialog.openError(getShell(), errTitle, e.getMessage()); - setReturnCode(RETURN_CODE_ERROR); + switch (mode) { + case SELECT: + return; + case CREATE: + clustersClient.createCluster(clusterName); + break; + case REGISTER: + clustersClient.registerCluster(clusterName, serverName); + break; } } } 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; } |