Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bootstrap

This commit is contained in:
Mark Payne 2014-12-12 10:31:50 -05:00
parent 2a2f0f0364 67354bd31c
commit d1271a281e
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ target
.settings .settings
.classpath .classpath
nbactions.xml nbactions.xml
nb-configuration.xml
.DS_Store .DS_Store
# Intellij # Intellij

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

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

18
nar-bundles/framework-bundle/framework/web/nifi-web-api/nb-configuration.xml
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
</properties>
</project-shared-configuration>

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

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