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 2015/12/02 23:41:30 UTC

[1/2] nifi git commit: NIFI-1239: Fixed bug that caused the cache to hold 0 elements instead of 100

Repository: nifi
Updated Branches:
  refs/heads/master 663b7f256 -> 69598a0b4


NIFI-1239: Fixed bug that caused the cache to hold 0 elements instead of 100


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/02dc7e82
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/02dc7e82
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/02dc7e82

Branch: refs/heads/master
Commit: 02dc7e82b248e3204554ba0ef41529b094a502b0
Parents: 6a8c2db
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 2 16:39:40 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 2 16:39:40 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/02dc7e82/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
index 432f22d..c46d3e2 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ConvertJSONToSQL.java
@@ -172,7 +172,7 @@ public class ConvertJSONToSQL extends AbstractProcessor {
 
         @Override
         protected boolean removeEldestEntry(Map.Entry<SchemaKey,TableSchema> eldest) {
-            return true;
+            return size() >= 100;
         }
     };
 


[2/2] nifi git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi

Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/69598a0b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/69598a0b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/69598a0b

Branch: refs/heads/master
Commit: 69598a0b40719118cd2b80f88cd818ba87dcf5da
Parents: 02dc7e8 663b7f2
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Dec 2 17:41:18 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Dec 2 17:41:18 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/controller/repository/StandardProcessSession.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------