You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/12 16:25:56 UTC
[2/3] incubator-nifi git commit: NIFI-164: Fixed
MockContentRepository that existed in a unit test
NIFI-164: Fixed MockContentRepository that existed in a unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d57861d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d57861d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d57861d8
Branch: refs/heads/develop
Commit: d57861d8b5283483b5721f5c4be3ce285ea6bcf4
Parents: 55d4b1c
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:19:20 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 12 10:19:20 2014 -0500
----------------------------------------------------------------------
.../nifi/controller/repository/TestStandardProcessSession.java | 4 ++++
.../org/apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java b/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
index 060bbd9..1ff63c5 100644
--- a/nar-bundles/framework-bundle/framework/core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
+++ b/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<>();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d57861d8/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
index 9de2661..f4f9d12 100644
--- a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/src/main/java/org/apache/nifi/provenance/VolatileProvenanceRepository.java
+++ b/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