Merge pull request Azure#1622 from hovsepm/release-1.1.0

Hovsep · Hovsep · commit 704dead520b9 · 2016-01-11T13:56:21.000-08:00
Fixed Storage issue in NewAzureStorageContext.cs
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)

Original file line number	Diff line number	Diff line change
`@@ -338,9 +338,9 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden`
`338`	`338`	`{`
`339`	`339`	`AzureEnvironment azureEnvironment = null;`
`340`	`340`
`341`		`- if (null != DefaultContext)`
	`341`	`+ if (null != SMProfile)`
`342`	`342`	`{`
`343`		`- if (string.IsNullOrEmpty(azureEnvironmentName) )`
	`343`	`+ if (DefaultContext != null && string.IsNullOrEmpty(azureEnvironmentName))`
`344`	`344`	`{`
`345`	`345`	`azureEnvironment = DefaultContext.Environment;`
`346`	`346`
`@@ -354,7 +354,7 @@ internal CloudStorageAccount GetStorageAccountWithAzureEnvironment(StorageCreden`
`354`	`354`	`{`
`355`	`355`	`try`
`356`	`356`	`{`
`357`		`- var profileClient = new ProfileClient(new AzureSMProfile());`
	`357`	`+ var profileClient = new ProfileClient(SMProfile);`
`358`	`358`	`azureEnvironment = profileClient.GetEnvironmentOrDefault(azureEnvironmentName);`
`359`	`359`	`}`
`360`	`360`	`catch(ArgumentException e)`