Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mRemoteNG/mRemoteNG.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortecxx <tecxx@rrs.at>2021-12-23 18:54:54 +0300
committertecxx <tecxx@rrs.at>2021-12-23 18:54:54 +0300
commit05ffcdeef77e44963535f62ca9868c8e854bb31d (patch)
tree1c88b2a8c141b03b69acc93637f421bedd033a38
parent6f1446339c96b436309997db7cf8ea47a644d646 (diff)
fix null object bug in ec2 connector
-rw-r--r--ExternalConnectors/AWS/InstanceInfo.cs5
-rw-r--r--mRemoteNG/Connection/ConnectionInitiator.cs3
2 files changed, 5 insertions, 3 deletions
diff --git a/ExternalConnectors/AWS/InstanceInfo.cs b/ExternalConnectors/AWS/InstanceInfo.cs
index eeeeee9b..53a9422b 100644
--- a/ExternalConnectors/AWS/InstanceInfo.cs
+++ b/ExternalConnectors/AWS/InstanceInfo.cs
@@ -26,8 +26,9 @@ namespace ExternalConnectors.AWS
default: Status = "Unknown"; break;
};
- PublicIP = instance.PublicIpAddress;
- PrivateIP = instance.PrivateIpAddress;
+ PublicIP = instance.PublicIpAddress ?? "";
+ PrivateIP = instance.PrivateIpAddress ?? "";
+
}
}
}
diff --git a/mRemoteNG/Connection/ConnectionInitiator.cs b/mRemoteNG/Connection/ConnectionInitiator.cs
index bc4f657a..da0b8145 100644
--- a/mRemoteNG/Connection/ConnectionInitiator.cs
+++ b/mRemoteNG/Connection/ConnectionInitiator.cs
@@ -67,7 +67,8 @@ namespace mRemoteNG.Connection
try
{
string host = await ExternalConnectors.AWS.EC2FetchDataService.GetEC2InstanceDataAsync("AWSAPI:" + connectionInfo.EC2InstanceId, connectionInfo.EC2Region);
- connectionInfo.Hostname = host;
+ if (!string.IsNullOrEmpty(host))
+ connectionInfo.Hostname = host;
}
catch
{