Merge branch 'NIFI164' into develop

nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java

@@ -1050,6 +1050,10 @@ public class FlowController implements EventAccess, ControllerServiceProvider, H
             	processScheduler.shutdown();
             }
             
+            if ( contentRepository != null ) {
+                contentRepository.shutdown();
+            }
+            
             if ( provenanceEventRepository != null ) {
             	try {
             		provenanceEventRepository.close();

nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/FileSystemRepository.java

@@ -223,6 +223,12 @@ public class FileSystemRepository implements ContentRepository {
         this.contentClaimManager = claimManager;
     }
 
+    @Override
+    public void shutdown() {
+        executor.shutdown();
+        containerCleanupExecutor.shutdown();
+    }
+    
     private static double getRatio(final String value) {
         final String trimmed = value.trim();
         final String percentage = trimmed.substring(0, trimmed.length() - 1);

nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java

@@ -137,6 +137,11 @@ public class VolatileContentRepository implements ContentRepository {
     public void initialize(final ContentClaimManager claimManager) {
         this.claimManager = claimManager;
     }
+    
+    @Override
+    public void shutdown() {
+        executor.shutdown();
+    }
 
     /**
      * Specifies a Backup Repository where data should be written if this

nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java

@@ -977,6 +977,10 @@ public class TestStandardProcessSession {
 
         private ConcurrentMap<ContentClaim, AtomicInteger> claimantCounts = new ConcurrentHashMap<>();
 
+        @Override
+        public void shutdown() {
+        }
+        
         public Set<ContentClaim> getExistingClaims() {
             final Set<ContentClaim> claims = new HashSet<>();
 

nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java

@@ -169,6 +169,8 @@ public class VolatileProvenanceRepository implements ProvenanceEventRepository {
 
     @Override
     public void close() throws IOException {
+        queryExecService.shutdownNow();
+        scheduledExecService.shutdown();
     }
 
     @Override

nifi-api/src/main/java/org/apache/nifi/controller/repository/ContentRepository.java

@@ -45,6 +45,12 @@ public interface ContentRepository {
      */
     void initialize(ContentClaimManager claimManager) throws IOException;
 
+    /**
+     * Shuts down the Content Repository, freeing any resources that may be held.
+     * This is called when an administrator shuts down NiFi.
+     */
+    void shutdown();
+    
     /**
      * Returns the names of all Containers that exist for this Content
      * Repository