From 4fd98677246c8cdac12752df69324dd03b461d8e Mon Sep 17 00:00:00 2001 From: David Richards Date: Thu, 20 Jul 2017 10:52:52 -0700 Subject: [PATCH] fix updateAzureActiveContext when passed NULL value --- R/internal.R | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/R/internal.R b/R/internal.R index c4ee918..47997a5 100644 --- 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 }