cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/4.6 to 238c483
Date Fri, 20 Nov 2015 19:50:08 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.6 401693eaf -> 238c483a7


CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networks


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/66fc7c62
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/66fc7c62
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/66fc7c62

Branch: refs/heads/4.6
Commit: 66fc7c62f4b21e770ecc6d6dfa99b3b06f410e89
Parents: f6db0a2
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Wed Nov 11 12:18:54 2015 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Mon Nov 16 11:46:26 2015 +0100

----------------------------------------------------------------------
 .../router/VirtualNetworkApplianceManagerImpl.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66fc7c62/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index f0e5f09..ca1f67d 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1013,10 +1013,12 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine>
{
                         s_logger.warn("Unable to update router " + router.getHostName() +
"'s status");
                     }
                     RedundantState state = RedundantState.UNKNOWN;
-                    if (answer != null && answer.getResult()) {
-                        state = answer.getState();
-                    } else {
-                        s_logger.info("Agent response doesn't seem to be correct ==> "
+ answer.getResult());
+                    if (answer != null) {
+                        if (answer.getResult()) {
+                            state = answer.getState();
+                        } else {
+                            s_logger.info("Agent response doesn't seem to be correct ==>
" + answer.getResult());
+                        }
                     }
                     router.setRedundantState(state);
                     updated = true;


Mime
View raw message