MLE-21542 More Polaris fixes

rjrudin · rjrudin · commit f5de1c81949f · 2025-05-22T10:27:29.000-04:00
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java
@@ -272,7 +272,9 @@ protected String convertXmlPayloadToJsonIfNecessary(CommandContext context, Stri
 		if (resourceMapper == null) {
 			resourceMapper = new DefaultResourceMapper(new API(context.getManageClient()));
 		}
-		return resourceMapper.readResource(payload, resourceClassType).getJson();
+		Resource resource = resourceMapper.readResource(payload, resourceClassType);
+		Objects.requireNonNull(resource);
+		return resource.getJson();
 	}
 
 	/**
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/databases/DeployOtherDatabasesCommand.java
@@ -285,6 +285,7 @@ protected List<DatabasePlan> mergeDatabasePlanFiles(CommandContext context, Data
 					String testPayload = payloadTokenReplacer.replaceTokens(copyFileToString(files.get(0)), context.getAppConfig(), true);
 					testDatabasePlan.setPayload(testPayload);
 					Database testDb = resourceMapper.readResource(payload, Database.class);
+					Objects.requireNonNull(testDb);
 					testDb.setDatabaseName(testContentDatabaseName);
 					testDatabasePlan.setDatabaseForSorting(testDb);
 				}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/forests/ForestBuilder.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/forests/ForestBuilder.java
@@ -22,10 +22,7 @@
 import com.marklogic.mgmt.mapper.DefaultResourceMapper;
 import com.marklogic.mgmt.mapper.ResourceMapper;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Based on a given ForestPlan object, builds a list of one or more Forest objects in memory - i.e. nothing is written
@@ -60,6 +57,8 @@ public ForestBuilder(ForestNamingStrategy forestNamingStrategy) {
 	 */
 	public List<Forest> buildForests(ForestPlan forestPlan, AppConfig appConfig) {
 		final String databaseName = forestPlan.getDatabaseName();
+		Objects.requireNonNull(databaseName);
+		Objects.requireNonNull(appConfig);
 
 		// Find out what forests we have already, keyed on host and then data directory
 		Map<String, Map<String, List<Forest>>> existingForestsMap = existingForestsMap(forestPlan);
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/plugins/InstallPluginsCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/plugins/InstallPluginsCommand.java
@@ -90,15 +90,18 @@ protected void installPluginsInPath(String path, AppConfig appConfig, DatabaseCl
 			return;
 		}
 
-		for (File dir : new File(path).listFiles()) {
-			if (!dir.isDirectory()) {
-				continue;
-			}
+		File[] files = new File(path).listFiles();
+		if (files != null) {
+			for (File dir : files) {
+				if (!dir.isDirectory()) {
+					continue;
+				}
 
-			makePlugin(dir, appConfig);
-			final String binaryUri = insertPluginZip(dir, appConfig, client);
-			if (binaryUri != null) {
-				installPlugin(binaryUri, appConfig, client);
+				makePlugin(dir, appConfig);
+				final String binaryUri = insertPluginZip(dir, appConfig, client);
+				if (binaryUri != null) {
+					installPlugin(binaryUri, appConfig, client);
+				}
 			}
 		}
 	}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasCommand.java
@@ -164,7 +164,7 @@ protected String findContentDatabaseAssociatedWithSchemasDatabase(CommandContext
 					String payload = copyFileToString(f, context);
 					try {
 						Database db = resourceMapper.readResource(payload, Database.class);
-						if (schemasDatabaseName.equals(db.getSchemaDatabase())) {
+						if (db != null && schemasDatabaseName != null && schemasDatabaseName.equals(db.getSchemaDatabase())) {
 							tdeValidationDatabase = db.getDatabaseName();
 							break;
 						}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/security/DeployPrivilegeRolesCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/security/DeployPrivilegeRolesCommand.java
@@ -68,7 +68,7 @@ protected String adjustPayloadBeforeSavingResource(CommandContext context, File
 				resourceMapper = new DefaultResourceMapper(new API(context.getManageClient()));
 			}
 			Privilege p = resourceMapper.readResource(payload, Privilege.class);
-			if (p.getRole() == null || p.getRole().isEmpty()) {
+			if (p == null || p.getRole() == null || p.getRole().isEmpty()) {
 				return null;
 			}
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/viewschemas/DeployViewSchemasCommand.java b/ml-app-deployer/src/main/java/com/marklogic/appdeployer/command/viewschemas/DeployViewSchemasCommand.java
@@ -88,15 +88,17 @@ protected ResourceManager getResourceManager(CommandContext context) {
 	protected void afterResourceSaved(ResourceManager mgr, CommandContext context, ResourceReference reference, SaveReceipt receipt) {
 		if (reference != null) {
 			File resourceFile = reference.getLastFile();
-			PayloadParser parser = new PayloadParser();
-			String viewSchemaName = parser.getPayloadFieldValue(receipt.getPayload(), "view-schema-name");
-			File parentFile = resourceFile.getParentFile();
-			if (parentFile != null) {
-				File viewDir = new File(parentFile, viewSchemaName + "-views");
-				if (viewDir.exists()) {
-					ViewManager viewMgr = new ViewManager(context.getManageClient(), currentDatabaseIdOrName, viewSchemaName);
-					for (File viewFile : listFilesInDirectory(viewDir)) {
-						saveResource(viewMgr, context, viewFile);
+			if (resourceFile != null) {
+				PayloadParser parser = new PayloadParser();
+				String viewSchemaName = parser.getPayloadFieldValue(receipt.getPayload(), "view-schema-name");
+				File parentFile = resourceFile.getParentFile();
+				if (parentFile != null) {
+					File viewDir = new File(parentFile, viewSchemaName + "-views");
+					if (viewDir.exists()) {
+						ViewManager viewMgr = new ViewManager(context.getManageClient(), currentDatabaseIdOrName, viewSchemaName);
+						for (File viewFile : listFilesInDirectory(viewDir)) {
+							saveResource(viewMgr, context, viewFile);
+						}
 					}
 				}
 			}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java
@@ -269,8 +269,7 @@ public HttpEntity<String> buildXmlEntity(String xml) {
 
 	protected void logRequest(String path, String contentType, String method) {
 		if (logger.isInfoEnabled()) {
-			String username = manageConfig != null ?
-				String.format("as user '%s' ", manageConfig.getUsername()) : "";
+			String username = String.format("as user '%s' ", manageConfig.getUsername());
 			logger.info("Sending {} {} request {}to path: {}", contentType, method, username, buildUri(path));
 		}
 	}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/forests/ForestManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/forests/ForestManager.java
@@ -25,6 +25,7 @@
 import com.marklogic.mgmt.mapper.ResourceMapper;
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.rest.util.Fragment;
+import com.marklogic.rest.util.XPathUtil;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -162,8 +163,9 @@ public void createJsonForest(String json) {
 
 	public boolean forestExists(String nameOrId) {
 		Fragment f = getManageClient().getXml("/manage/v2/forests");
-		return f.elementExists(format("/node()/f:list-items/f:list-item[f:nameref = '%s' or f:idref = '%s']", nameOrId,
-			nameOrId));
+		String valueForXPath = XPathUtil.sanitizeValueForXPathExpression(nameOrId);
+		return f.elementExists(format("/node()/f:list-items/f:list-item[f:nameref = '%s' or f:idref = '%s']", valueForXPath,
+			valueForXPath));
 	}
 
 	public void attachForest(String forestIdOrName, String databaseIdOrName) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/mimetypes/MimetypeManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/mimetypes/MimetypeManager.java
@@ -23,6 +23,8 @@
 import com.marklogic.mgmt.mapper.ResourceMapper;
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 
+import java.util.Objects;
+
 public class MimetypeManager extends AbstractResourceManager {
 
 	private boolean updateWhenPropertiesAreEqual = false;
@@ -63,6 +65,7 @@ public SaveReceipt updateResource(String payload, String resourceId) {
 		}
 
 		Mimetype incomingMimetype = resourceMapper.readResource(payload, Mimetype.class);
+		Objects.requireNonNull(incomingMimetype);
 		final String name = incomingMimetype.getName();
 
 		String existingJson = super.getPropertiesAsJson(name);
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/AmpManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/AmpManager.java
@@ -21,8 +21,10 @@
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.rest.util.Fragment;
 import com.marklogic.rest.util.ResourcesFragment;
+import com.marklogic.rest.util.XPathUtil;
 import org.springframework.http.ResponseEntity;
 
+import javax.xml.xpath.XPath;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,12 +98,13 @@ public boolean ampExists(ResourcesFragment resources, String localName, String d
 		String xpath = "/node()/*[local-name(.) = 'list-items']/node()[" +
 			"(*[local-name(.) = 'nameref'] = '%s' or *[local-name(.) = 'idref'] = '%s')" +
 			" and *[local-name(.) = 'document-uri'] = '%s'";
-		xpath = format(xpath, localName, localName, documentUri);
+		xpath = format(xpath, XPathUtil.sanitizeValueForXPathExpression(localName),
+			XPathUtil.sanitizeValueForXPathExpression(localName), XPathUtil.sanitizeValueForXPathExpression(documentUri));
 		if (namespace != null) {
-			xpath += format(" and *[local-name(.) = 'namespace'] = '%s'", namespace);
+			xpath += format(" and *[local-name(.) = 'namespace'] = '%s'", XPathUtil.sanitizeValueForXPathExpression(namespace));
 		}
 		if (modulesDatabase != null) {
-			xpath += format(" and *[local-name(.) = 'modules-database'] = '%s'", modulesDatabase);
+			xpath += format(" and *[local-name(.) = 'modules-database'] = '%s'", XPathUtil.sanitizeValueForXPathExpression(modulesDatabase));
 		} else {
 			xpath += format(" and *[local-name(.) = 'modules-database'] = 'filesystem'");
 		}
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/CertificateTemplateManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/CertificateTemplateManager.java
@@ -21,7 +21,7 @@
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.mgmt.util.ObjectMapperFactory;
 import com.marklogic.rest.util.Fragment;
-
+import com.marklogic.rest.util.XPathUtil;
 import org.springframework.http.ResponseEntity;
 
 /**
@@ -144,9 +144,11 @@ public boolean certificateExists(String templateIdOrName) {
 	 */
 	public boolean certificateExists(String templateIdOrName, String certificateHostName) {
 		Fragment response = getCertificatesForTemplate(templateIdOrName);
-		return certificateHostName != null ?
-			response.elementExists(format("/msec:certificate-list/msec:certificate[msec:host-name = '%s']", certificateHostName)) :
-			response.elementExists("/msec:certificate-list/msec:certificate");
+		if (certificateHostName != null) {
+			String valueForXPath = XPathUtil.sanitizeValueForXPathExpression(certificateHostName);
+			return response.elementExists(format("/msec:certificate-list/msec:certificate[msec:host-name = '%s']", valueForXPath));
+		}
+		return response.elementExists("/msec:certificate-list/msec:certificate");
 	}
 
     public Fragment getCertificatesForTemplate(String templateIdOrName) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/ProtectedPathManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/ProtectedPathManager.java
@@ -19,6 +19,7 @@
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.rest.util.Fragment;
 import com.marklogic.rest.util.ResourcesFragment;
+import com.marklogic.rest.util.XPathUtil;
 import org.springframework.web.client.ResourceAccessException;
 
 public class ProtectedPathManager extends AbstractResourceManager {
@@ -70,7 +71,7 @@ public boolean exists(String resourceNameOrId, String... resourceUrlParams) {
 		}
 		return getAsXml().elementExists(format(
 			"/node()/*[local-name(.) = 'list-items']/node()[*[local-name(.) = 'nameref'] = '%s']",
-			resourceNameOrId));
+			XPathUtil.sanitizeValueForXPathExpression(resourceNameOrId)));
 	}
 
 	public String getIdForPathExpression(String pathExpression) {
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/QueryRolesetManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/QueryRolesetManager.java
@@ -19,6 +19,7 @@
 import com.marklogic.mgmt.ManageClient;
 import com.marklogic.mgmt.resource.AbstractResourceManager;
 import com.marklogic.rest.util.ResourcesFragment;
+import com.marklogic.rest.util.XPathUtil;
 import org.apache.commons.lang3.StringUtils;
 
 public class QueryRolesetManager extends AbstractResourceManager {
@@ -75,7 +76,7 @@ public boolean exists(String resourceNameOrId, String... resourceUrlParams) {
 		ResourcesFragment resourcesFragment = getAsXml();
 		return resourcesFragment.elementExists(format(
 			"/node()/*[local-name(.) = 'list-items']/node()[*[local-name(.) = 'idref'] = '%s']",
-			getIdForRoleNames(resourceNameOrId, resourcesFragment)));
+			XPathUtil.sanitizeValueForXPathExpression(getIdForRoleNames(resourceNameOrId, resourcesFragment))));
 	}
 
 	/**
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/RoleManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/RoleManager.java
@@ -55,7 +55,7 @@ protected SaveReceipt createNewResource(String payload, String resourceId) {
 
 		Role role = resourceMapper.readResource(payload, Role.class);
 
-		if (role.hasPermissionWithOwnRoleName()) {
+		if (role != null && role.hasPermissionWithOwnRoleName()) {
 			role.getPermission().clear();
 			if (logger.isInfoEnabled()) {
 				logger.info("Creating role '" + resourceId + "' that has permissions that refer to itself, " +
diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/tasks/TaskManager.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/tasks/TaskManager.java
@@ -24,10 +24,12 @@
 import com.marklogic.mgmt.resource.requests.RequestManager;
 import com.marklogic.rest.util.Fragment;
 import com.marklogic.rest.util.XPathUtil;
+import org.springframework.http.ResponseEntity;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * The "groupName" property of this class corresponds to the "group-id" querystring parameter. It's called
@@ -170,9 +172,10 @@ public boolean exists(String resourceNameOrId, String... resourceUrlParams) {
 			logger.info("Checking for existence of resource: " + resourceNameOrId);
 		}
 		Fragment f = getAsXml();
+		String valueForXPath = XPathUtil.sanitizeValueForXPathExpression(resourceNameOrId);
 		return f.elementExists(format(
 			"/t:tasks-default-list/t:list-items/t:list-item[t:task-path = '%s' or t:idref = '%s']",
-			resourceNameOrId, resourceNameOrId));
+			valueForXPath, valueForXPath));
 	}
 
 	/**
@@ -204,7 +207,10 @@ protected void updateNewTaskIfItShouldBeDisabled(String payload, SaveReceipt rec
 		String enabled = payloadParser.getPayloadFieldValue(payload, "task-enabled", false);
 		if ("false".equalsIgnoreCase(enabled)) {
 			// We don't reuse updateResource here since that first deletes the task
-			URI uri = receipt.getResponse().getHeaders().getLocation();
+			ResponseEntity<String> response = receipt.getResponse();
+			Objects.requireNonNull(response);
+			URI uri = response.getHeaders().getLocation();
+			Objects.requireNonNull(uri, "Expecting the response to have a location header");
 			// Expecting a path of "/manage/(version)/tasks/(taskId)"
 			String[] tokens = uri.getPath().split("/");
 			final String taskId = tokens[tokens.length - 1];
diff --git a/ml-app-deployer/src/main/java/com/marklogic/rest/util/Fragment.java b/ml-app-deployer/src/main/java/com/marklogic/rest/util/Fragment.java
@@ -25,6 +25,7 @@
 import org.jdom2.output.XMLOutputter;
 import org.jdom2.xpath.XPathExpression;
 import org.jdom2.xpath.XPathFactory;
+import org.xml.sax.InputSource;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -44,12 +45,18 @@ public Fragment(Fragment other) {
 
 	public Fragment(String xml, Namespace... namespaces) {
 		try {
-			// As of 5.1.0, using same best practices as found in Java Client.
 			SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING);
+
+			// Prevent DTDs from being loaded
 			builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+
+			// Disable external entities
 			builder.setFeature("http://xml.org/sax/features/external-general-entities", false);
 			builder.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
 
+			// Set a no-op EntityResolver to block external DTDs
+			builder.setEntityResolver((publicId, systemId) -> new InputSource(new StringReader("")));
+
 			internalDoc = builder.build(new StringReader(xml));
 			List<Namespace> list = new ArrayList<>();
 			list.add(Namespace.getNamespace("arp", "http://marklogic.com/manage/alert-rule/properties"));
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/batch/DataMovementBatchWriter.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/batch/DataMovementBatchWriter.java
@@ -58,7 +58,7 @@ public void waitForCompletion() {
 		if (writeBatcher != null) {
 			writeBatcher.flushAndWait();
 			if (jobTicket != null) {
-				dataMovementManager.stopJob(writeBatcher);
+				dataMovementManager.stopJob(jobTicket);
 			} else {
 				dataMovementManager.stopJob(writeBatcher);
 			}
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/qconsole/impl/QconsoleScripts.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/qconsole/impl/QconsoleScripts.java
@@ -20,6 +20,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class QconsoleScripts {
@@ -38,13 +39,21 @@ public class QconsoleScripts {
 	}
 
 	private static String readFile(String fileName) throws IOException {
-		try (InputStream inputStream = QconsoleScripts.class.getClassLoader().getResourceAsStream(fileName)) {
+		InputStream inputStream = null;
+		try {
+			ClassLoader classLoader = QconsoleScripts.class.getClassLoader();
+			Objects.requireNonNull(classLoader);
+			inputStream = classLoader.getResourceAsStream(fileName);
 			if (inputStream != null) {
 				return new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
 					.lines().collect(Collectors.joining("\n"));
 			} else {
 				throw new IOException("Unable to find file: " + fileName);
 			}
+		} finally {
+			if (inputStream != null) {
+				inputStream.close();
+			}
 		}
 	}
 }
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/schemasloader/impl/TdeDocumentFileProcessor.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/schemasloader/impl/TdeDocumentFileProcessor.java
@@ -74,7 +74,7 @@ private boolean isTemplateBatchInsertSupported() {
 			// modified, in which case templateBatchInsertSupported is set to null
 			this.templateBatchInsertSupported = TdeUtil.templateBatchInsertSupported(contentDatabaseClient);
 		}
-		return this.templateBatchInsertSupported;
+		return this.templateBatchInsertSupported != null ? this.templateBatchInsertSupported : false;
 	}
 
 	/**
@@ -107,7 +107,7 @@ private void validateTdeTemplate(DocumentFile documentFile) {
 
 				if (call != null) {
 					ObjectNode node = (ObjectNode) call.evalAs(JsonNode.class);
-					if (node.get("valid").asBoolean()) {
+					if (node.has("valid") && node.get("valid").asBoolean()) {
 						logger.info("TDE template passed validation: " + file);
 					} else {
 						throw new RuntimeException(format("TDE template failed validation; file: %s; cause: %s", file, node.get("message").asText()));
diff --git a/ml-javaclient-util/src/main/java/com/marklogic/client/ext/ssl/SslUtil.java b/ml-javaclient-util/src/main/java/com/marklogic/client/ext/ssl/SslUtil.java

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,9 @@ protected String convertXmlPayloadToJsonIfNecessary(CommandContext context, Stri`
`272`	`272`	`if (resourceMapper == null) {`
`273`	`273`	`resourceMapper = new DefaultResourceMapper(new API(context.getManageClient()));`
`274`	`274`	`}`
`275`		`- return resourceMapper.readResource(payload, resourceClassType).getJson();`
	`275`	`+ Resource resource = resourceMapper.readResource(payload, resourceClassType);`
	`276`	`+ Objects.requireNonNull(resource);`
	`277`	`+ return resource.getJson();`
`276`	`278`	`}`
`277`	`279`
`278`	`280`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ protected List<DatabasePlan> mergeDatabasePlanFiles(CommandContext context, Data`
`285`	`285`	`String testPayload = payloadTokenReplacer.replaceTokens(copyFileToString(files.get(0)), context.getAppConfig(), true);`
`286`	`286`	`testDatabasePlan.setPayload(testPayload);`
`287`	`287`	`Database testDb = resourceMapper.readResource(payload, Database.class);`
	`288`	`+ Objects.requireNonNull(testDb);`
`288`	`289`	`testDb.setDatabaseName(testContentDatabaseName);`
`289`	`290`	`testDatabasePlan.setDatabaseForSorting(testDb);`
`290`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ protected String findContentDatabaseAssociatedWithSchemasDatabase(CommandContext`
`164`	`164`	`String payload = copyFileToString(f, context);`
`165`	`165`	`try {`
`166`	`166`	`Database db = resourceMapper.readResource(payload, Database.class);`
`167`		`- if (schemasDatabaseName.equals(db.getSchemaDatabase())) {`
	`167`	`+ if (db != null && schemasDatabaseName != null && schemasDatabaseName.equals(db.getSchemaDatabase())) {`
`168`	`168`	`tdeValidationDatabase = db.getDatabaseName();`
`169`	`169`	`break;`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected String adjustPayloadBeforeSavingResource(CommandContext context, File`
`68`	`68`	`resourceMapper = new DefaultResourceMapper(new API(context.getManageClient()));`
`69`	`69`	`}`
`70`	`70`	`Privilege p = resourceMapper.readResource(payload, Privilege.class);`
`71`		`- if (p.getRole() == null \|\| p.getRole().isEmpty()) {`
	`71`	`+ if (p == null \|\| p.getRole() == null \|\| p.getRole().isEmpty()) {`
`72`	`72`	`return null;`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,7 @@ public HttpEntity<String> buildXmlEntity(String xml) {`
`269`	`269`
`270`	`270`	`protected void logRequest(String path, String contentType, String method) {`
`271`	`271`	`if (logger.isInfoEnabled()) {`
`272`		`- String username = manageConfig != null ?`
`273`		`- String.format("as user '%s' ", manageConfig.getUsername()) : "";`
	`272`	`+ String username = String.format("as user '%s' ", manageConfig.getUsername());`
`274`	`273`	`logger.info("Sending {} {} request {}to path: {}", contentType, method, username, buildUri(path));`
`275`	`274`	`}`
`276`	`275`	`}`