You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/15 11:28:23 UTC
[2/4] git commit: updated refs/heads/master to 34a791c
Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in NetworkOrchestrator.java If answer is null, method will throw ConnectionException in line 3016 as satisfied by condition stated in line 3014
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #449
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0dc25905
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0dc25905
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0dc25905
Branch: refs/heads/master
Commit: 0dc25905d2eda8f5539960d381e1d9af7bf30982
Parents: 1b79a8e
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 14 21:36:11 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Jun 15 12:27:54 2015 +0300
----------------------------------------------------------------------
.../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0dc25905/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 6277df1..d4cdd9d 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -3017,7 +3017,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
}
if (!answer.getResult()) {
- s_logger.warn("Unable to setup agent " + hostId + " due to " + ((answer != null) ? answer.getDetails() : "return null"));
+ s_logger.warn("Unable to setup agent " + hostId + " due to " + answer.getDetails() );
String msg = "Incorrect Network setup on agent, Reinitialize agent after network names are setup, details : " + answer.getDetails();
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, host.getPodId(), msg, msg);
throw new ConnectionException(true, msg);