You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/01/30 23:41:32 UTC
[41/50] [abbrv] git commit: updated refs/heads/ui-restyle to 849d601
findbugs: possible nulpointer derefs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/920163f2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/920163f2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/920163f2
Branch: refs/heads/ui-restyle
Commit: 920163f24f4348309c223a973cf68d7f8352babf
Parents: ee1e8a6
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jan 29 13:09:17 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jan 29 13:09:17 2014 +0100
----------------------------------------------------------------------
server/src/com/cloud/storage/upload/UploadMonitorImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/920163f2/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index 991f35f..6f1f5e9 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -269,7 +269,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
CreateEntityDownloadURLCommand cmd = new CreateEntityDownloadURLCommand(((ImageStoreEntity)store).getMountPoint(), path, uuid, null);
Answer ans = ep.sendMessage(cmd);
if (ans == null || !ans.getResult()) {
- errorString = "Unable to create a link for " + type + " id:" + template.getId() + "," + ans.getDetails();
+ errorString = "Unable to create a link for " + type + " id:" + template.getId() + "," + (ans == null ? "" : ans.getDetails());
s_logger.error(errorString);
throw new CloudRuntimeException(errorString);
}
@@ -325,7 +325,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor {
CreateEntityDownloadURLCommand cmd = new CreateEntityDownloadURLCommand(((ImageStoreEntity)secStore).getMountPoint(), path, uuid, null);
Answer ans = ep.sendMessage(cmd);
if (ans == null || !ans.getResult()) {
- errorString = "Unable to create a link for " + type + " id:" + entityId + "," + ans.getDetails();
+ errorString = "Unable to create a link for " + type + " id:" + entityId + "," + (ans == null ? "" : ans.getDetails());
s_logger.warn(errorString);
throw new CloudRuntimeException(errorString);
}