From d43e6fef9ca372663c3bf53f20fb4f48fef71a9d Mon Sep 17 00:00:00 2001
From: Frank <frank@cloud.com>
Date: Fri, 6 May 2011 10:24:32 -0700
Subject: [PATCH] Fix string comparsion issue

---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 2 +-
 server/src/com/cloud/server/ConfigurationServerImpl.java        | 2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index eda38edf31e..de8d297de25 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4325,7 +4325,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
 					"remoteIP", cmd.getRemoteIp(), "greKey", cmd.getKey(), "from",
 					Long.toString(cmd.getFrom()), "to", Long.toString(cmd.getTo()));
 			String[] res = result.split(":");
-			if (res.length != 2 || (res.length == 2 && res[1] == "[]")) {
+			if (res.length != 2 || (res.length == 2 && res[1].equalsIgnoreCase("[]"))) {
 				return new OvsCreateGreTunnelAnswer(cmd, false, result,
 						_host.ip, bridge);
 			} else {
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 530a29982fc..334e374aea7 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -395,7 +395,7 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         String already = _configDao.getValue("ssh.privatekey");
         String homeDir = Script.runSimpleBashScript("echo ~");
         String userid = System.getProperty("user.name");
-        if (homeDir == "~") {
+        if (homeDir != null && homeDir.equalsIgnoreCase("~")) {
             s_logger.error("No home directory was detected.  Set the HOME environment variable to point to your user profile or home directory.");
             throw new CloudRuntimeException("No home directory was detected.  Set the HOME environment variable to point to your user profile or home directory.");
         }
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 87fb094bc76..8f856313d16 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1399,7 +1399,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
                     throw new CloudRuntimeException("Unable to find storage pools in zone " + zoneId);
                 }
                 pool = storagePools.get(0);
-                if ( snapshot.getVersion() == "2.1" ) {
+                if (snapshot.getVersion() != null && snapshot.getVersion().equalsIgnoreCase("2.1")) {
                     VolumeVO volume = _volsDao.findByIdIncludingRemoved(volumeId);
                     if ( volume == null ) {
                         throw new CloudRuntimeException("failed to upgrade snapshot " + snapshotId + " due to unable to find orignal volume:" + volumeId + ", try it later ");