nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: NIFI-108: - Addressing comments from review.
Date Thu, 21 Jan 2016 13:12:41 GMT
Repository: nifi
Updated Branches:
  refs/heads/NIFI-108-2 1e74357ca -> e31c3c943


NIFI-108:
- Addressing comments from review.


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

Branch: refs/heads/NIFI-108-2
Commit: e31c3c943dc11991d9d13a3e5317de6ee12e0a17
Parents: 1e74357
Author: Matt Gilman <matt.c.gilman@gmail.com>
Authored: Thu Jan 21 08:12:25 2016 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Thu Jan 21 08:12:25 2016 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java   | 2 +-
 .../java/org/apache/nifi/controller/StandardFlowFileQueue.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/e31c3c94/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java
index 639cc85..960ad0d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowFileEntity.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /**
  * A serialized representation of this class can be placed in the entity body of a request
or response to or from the API. This particular entity holds a reference to a FlowFileDTO.
  */
-@XmlRootElement(name = "listingRequestEntity")
+@XmlRootElement(name = "flowFileEntity")
 public class FlowFileEntity extends Entity {
 
     private FlowFileDTO flowFile;

http://git-wip-us.apache.org/repos/asf/nifi/blob/e31c3c94/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
index cda00c8..04763ee 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
@@ -847,7 +847,7 @@ public final class StandardFlowFileQueue implements FlowFileQueue {
 
     @Override
     public ListFlowFileStatus listFlowFiles(final String requestIdentifier, final int maxResults)
{
-        // purge any old requests from the map just to keep it clean. But if there are very
requests, which is usually the case, then don't bother
+        // purge any old requests from the map just to keep it clean. But if there are very
few requests, which is usually the case, then don't bother
         if (listRequestMap.size() > 10) {
             final List<String> toDrop = new ArrayList<>();
             for (final Map.Entry<String, ListFlowFileRequest> entry : listRequestMap.entrySet())
{


Mime
View raw message