changes to fix issue microsoft#86

algattik · Jul 22, 2017 · d986c54 · d986c54
1 parent 3db3fb8
commit d986c54
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/R/internal.R b/R/internal.R
@@ -165,12 +165,14 @@ refreshStorageKey <- function(azureActiveContext, storageAccount, resourceGroup)
 
 updateAzureActiveContext <- function(x, storageAccount, storageKey, resourceGroup, container, blob, directory) {
   # updates the active azure context in place
-  assert_that(is.azureActiveContext(x))
-  if (!missing(storageAccount)) x$storageAccount <- storageAccount
-  if (!missing(resourceGroup))  x$resourceGroup  <- resourceGroup
-  if (!missing(storageKey))     x$storageKey     <- storageKey
-  if (!missing(container)) x$container <- container
-  if (!missing(blob)) x$blob <- blob
-  if (!missing(directory)) x$directory <- directory
+  if (!is.null(x)) {
+    assert_that(is.azureActiveContext(x))
+    if (!missing(storageAccount)) x$storageAccount <- storageAccount
+    if (!missing(resourceGroup))  x$resourceGroup  <- resourceGroup
+    if (!missing(storageKey))     x$storageKey     <- storageKey
+    if (!missing(container)) x$container <- container
+    if (!missing(blob)) x$blob <- blob
+    if (!missing(directory)) x$directory <- directory
+  }
   TRUE
 }