Merge pull request apache#1073 from ustcweizhou/CLOUDSTACK-9055

remibergsma · remibergsma · commit 238c483a7ca7 · 2015-11-20T20:49:32.000+01:00
CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networksThis issue happened when the KVM nodes is down.It might also happen when the cloudstack-agent is killed unexpectedly.

* pr/1073:
  CLOUDSTACK-9055: fix NPE in updating Redundant State of VPC networks

Signed-off-by: Remi Bergsma &lt;github@remi.nl&gt;
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1013,10 +1013,12 @@ protected void updateRoutersRedundantState(final List<DomainRouterVO> routers) {
                         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;
