From 1724521ebf806168c9d9ce5d19dfdb6aab4ed2fe Mon Sep 17 00:00:00 2001 From: David Sparer Date: Wed, 22 Aug 2018 07:06:44 -0500 Subject: [PATCH] added some null guards to methods --- mRemoteV1/Config/Putty/PuttySessionsManager.cs | 12 +++++++----- mRemoteV1/Connection/ConnectionsService.cs | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mRemoteV1/Config/Putty/PuttySessionsManager.cs b/mRemoteV1/Config/Putty/PuttySessionsManager.cs index 42eab567..72e9a1ce 100644 --- a/mRemoteV1/Config/Putty/PuttySessionsManager.cs +++ b/mRemoteV1/Config/Putty/PuttySessionsManager.cs @@ -1,13 +1,13 @@ -using mRemoteNG.Tools; using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; +using mRemoteNG.Tools; using mRemoteNG.Tree.Root; // ReSharper disable ArrangeAccessorOwnerBody namespace mRemoteNG.Config.Putty { - public class PuttySessionsManager + public class PuttySessionsManager { public static PuttySessionsManager Instance { get; } = new PuttySessionsManager(); @@ -35,10 +35,12 @@ namespace mRemoteNG.Config.Putty } } - private void AddSessionsFromProvider(AbstractPuttySessionsProvider provider) + private void AddSessionsFromProvider(AbstractPuttySessionsProvider puttySessionProvider) { - var rootTreeNode = provider.RootInfo; - provider.GetSessions(); + puttySessionProvider.ThrowIfNull(nameof(puttySessionProvider)); + + var rootTreeNode = puttySessionProvider.RootInfo; + puttySessionProvider.GetSessions(); if (!RootPuttySessionsNodes.Contains(rootTreeNode) && rootTreeNode.HasChildren()) RootPuttySessionsNodes.Add(rootTreeNode); diff --git a/mRemoteV1/Connection/ConnectionsService.cs b/mRemoteV1/Connection/ConnectionsService.cs index dba620d7..c6240ec9 100644 --- a/mRemoteV1/Connection/ConnectionsService.cs +++ b/mRemoteV1/Connection/ConnectionsService.cs @@ -45,6 +45,7 @@ namespace mRemoteNG.Connection { try { + filename.ThrowIfNullOrEmpty(nameof(filename)); var newConnectionsModel = new ConnectionTreeModel(); newConnectionsModel.AddRootNode(new RootNodeInfo(RootNodeType.Connection)); SaveConnections(newConnectionsModel, false, new SaveFilter(), filename, true);