Ensuring taskExecutor is set to null so it can be re-initialized, and not performing a write if there are no schemas to load

Author: Rob Rudin

src/main/java/com/marklogic/client/modulesloader/impl/DefaultModulesLoader.java

@@ -143,12 +143,14 @@ protected void waitForTaskExecutorToFinish() {
 		if (shutdownTaskExecutorAfterLoadingModules) {
 			if (taskExecutor instanceof ExecutorConfigurationSupport) {
 				((ExecutorConfigurationSupport) taskExecutor).shutdown();
+				taskExecutor = null;
 			} else if (taskExecutor instanceof DisposableBean) {
 				try {
 					((DisposableBean) taskExecutor).destroy();
 				} catch (Exception ex) {
 					logger.warn("Unexpected exception while calling destroy() on taskExecutor: " + ex.getMessage(), ex);
 				}
+				taskExecutor = null;
 			}
 		} else if (logger.isDebugEnabled()) {
 			logger.debug("shutdownTaskExecutorAfterLoadingModules is set to false, so not shutting down taskExecutor");

src/main/java/com/marklogic/client/schemasloader/impl/DefaultSchemasLoader.java

@@ -71,23 +71,25 @@ public DefaultSchemasLoader(DocumentFileReader documentFileReader, BatchWriter b
 	 */
 	@Override
 	public List<DocumentFile> loadSchemas(String... paths) {
-		try {
-			List<DocumentFile> documentFiles = documentFileReader.readDocumentFiles(paths);
+		List<DocumentFile> documentFiles = documentFileReader.readDocumentFiles(paths);
+		if (documentFiles != null && !documentFiles.isEmpty()) {
+			if (logger.isInfoEnabled()) {
+				logger.info(format("Writing %d files into the schemas database", documentFiles.size()));
+			}
 			batchWriter.write(documentFiles);
-			return documentFiles;
-		} finally {
 			if (waitForCompletion) {
 				batchWriter.waitForCompletion();
 			}
 		}
+		return documentFiles;
 	}
 
 	/**
-	 * @deprecated
 	 * @param baseDir
 	 * @param schemasDataFinder
 	 * @param client
 	 * @return
+	 * @deprecated
 	 */
 	@Override
 	public Set<File> loadSchemas(File baseDir, SchemasFinder schemasDataFinder, DatabaseClient client) {