From 56f4dec1e221a0fbb914b03c054e8acc9a0cf2a7 Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Tue, 8 May 2012 14:38:38 +0530 Subject: [PATCH] bug CS-14785: String equality should be through equals function....what was i thinking !!!. --- server/src/com/cloud/storage/download/DownloadListener.java | 6 +++++- server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java index 7ac5dd3dd80..9b2ef89c604 100755 --- a/server/src/com/cloud/storage/download/DownloadListener.java +++ b/server/src/com/cloud/storage/download/DownloadListener.java @@ -214,7 +214,11 @@ public class DownloadListener implements Listener { } public void logDisconnect() { - s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName()); + if (template != null){ + s_logger.warn("Unable to monitor download progress of " + template.getName() + " at host " + sserver.getName()); + }else { + s_logger.warn("Unable to monitor download progress of " + volume.getName() + " at host " + sserver.getName()); + } } public synchronized void updateDatabase(Status state, String errorString) { diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index a6ff9941cac..31d5062df23 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -591,7 +591,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager }else { try { // Format of data disk should be the same as root disk - if(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId()) != volHostVO.getFormat().getFileExtension()){ + if( ! volHostVO.getFormat().getFileExtension().equals(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId())) ){ throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " +volHostVO.getFormat().getFileExtension()+ " is not compatible with the vm hypervisor type" ); }