Repository: cloudstack Updated Branches: refs/heads/master fd96ad02d -> 5efded3ae
Fixed few coverity issues reported Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5efded3a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5efded3a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5efded3a Branch: refs/heads/master Commit: 5efded3ae93c1e926a641fe445611926101513f0 Parents: fd96ad0 Author: Santhosh Edukulla <santhosh.eduku...@gmail.com> Authored: Mon Aug 11 17:52:32 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Mon Aug 11 17:52:32 2014 +0530 ---------------------------------------------------------------------- agent/src/com/cloud/agent/Agent.java | 39 ++++++++++---------- .../consoleproxy/ConsoleProxyResource.java | 31 ++++++++-------- 2 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5efded3a/agent/src/com/cloud/agent/Agent.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index b0113c7..2b33f5c 100755 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -297,26 +297,27 @@ public class Agent implements HandlerFactory, IAgentControl { public void sendStartup(Link link) { final StartupCommand[] startup = _resource.initialize(); - final Command[] commands = new Command[startup.length]; - for (int i = 0; i < startup.length; i++) { - setupStartupCommand(startup[i]); - commands[i] = startup[i]; - } - - final Request request = new Request(_id != null ? _id : -1, -1, commands, false, false); - request.setSequence(getNextSequence()); + if (startup != null) { + final Command[] commands = new Command[startup.length]; + for (int i = 0; i < startup.length; i++) { + setupStartupCommand(startup[i]); + commands[i] = startup[i]; + } + final Request request = new Request(_id != null ? _id : -1, -1, commands, false, false); + request.setSequence(getNextSequence()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Sending Startup: " + request.toString()); - } - synchronized (this) { - _startup = new StartupTask(link); - _timer.schedule(_startup, _startupWait); - } - try { - link.send(request.toBytes()); - } catch (final ClosedChannelException e) { - s_logger.warn("Unable to send reques: " + request.toString()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Sending Startup: " + request.toString()); + } + synchronized (this) { + _startup = new StartupTask(link); + _timer.schedule(_startup, _startupWait); + } + try { + link.send(request.toBytes()); + } catch (final ClosedChannelException e) { + s_logger.warn("Unable to send reques: " + request.toString()); + } } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5efded3a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index c3dea2e..16173aa 100644 --- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -120,11 +120,10 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe } private void disableRpFilter() { - try { - FileWriter fstream = new FileWriter("/proc/sys/net/ipv4/conf/eth2/rp_filter"); - BufferedWriter out = new BufferedWriter(fstream); + try (FileWriter fstream = new FileWriter("/proc/sys/net/ipv4/conf/eth2/rp_filter"); + BufferedWriter out = new BufferedWriter(fstream);) + { out.write("0"); - out.close(); } catch (IOException e) { s_logger.warn("Unable to disable rp_filter"); } @@ -242,18 +241,18 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe if (_localgw != null) { String mgmtHost = (String)params.get("host"); - addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, mgmtHost); - - String internalDns1 = (String)params.get("internaldns1"); - if (internalDns1 == null) { - s_logger.warn("No DNS entry found during configuration of NfsSecondaryStorage"); - } else { - addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, internalDns1); - } - - String internalDns2 = (String)params.get("internaldns2"); - if (internalDns2 != null) { - addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, internalDns2); + if (_eth1ip != null) { + addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, mgmtHost); + String internalDns1 = (String) params.get("internaldns1"); + if (internalDns1 == null) { + s_logger.warn("No DNS entry found during configuration of NfsSecondaryStorage"); + } else { + addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, internalDns1); + } + String internalDns2 = (String) params.get("internaldns2"); + if (internalDns2 != null) { + addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, internalDns2); + } } }
