Merge pull request #1622 from hovsepm/release-1.1.0

Fixed Storage issue in NewAzureStorageContext.cs
Azure · Jan 11, 2016 · 704dead · 704dead
2 parents 95c6d74 + 2437b6e
commit 704dead
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs b/src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
@@ -338,9 +338,9 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden
         {
             AzureEnvironment azureEnvironment = null;
 
-            if (null != DefaultContext)
+            if (null != SMProfile)
             {
-                if (string.IsNullOrEmpty(azureEnvironmentName) )
+                if (DefaultContext != null && string.IsNullOrEmpty(azureEnvironmentName))
                 {
                     azureEnvironment = DefaultContext.Environment;
 
@@ -354,7 +354,7 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden
                 {
                     try
                     {
-                        var profileClient = new ProfileClient(new AzureSMProfile());
+                        var profileClient = new ProfileClient(SMProfile);
                         azureEnvironment = profileClient.GetEnvironmentOrDefault(azureEnvironmentName);
                     }
                     catch(ArgumentException e)