You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2016/09/02 13:39:33 UTC

nifi git commit: NIFI-2722: - Updating the component entity as long as the proposed entity is not older than the current one since stats are bundled in the entity too.

Repository: nifi
Updated Branches:
  refs/heads/master 867c84f32 -> d37480eaf


NIFI-2722:
- Updating the component entity as long as the proposed entity is not older than the current one since stats are bundled in the entity too.

This closes #983

Signed-off-by: Koji Kawamura <ij...@apache.org>


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

Branch: refs/heads/master
Commit: d37480eaffec7f24238798d54dd09b3d8526cef8
Parents: 867c84f
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Sep 2 07:34:57 2016 -0400
Committer: Koji Kawamura <ij...@apache.org>
Committed: Fri Sep 2 22:25:25 2016 +0900

----------------------------------------------------------------------
 .../nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/d37480ea/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
index a129edc..3cf9fdf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-client.js
@@ -48,7 +48,7 @@ nf.Client = (function() {
         },
 
         /**
-         * Determines whether the proposedData is newer than the currentData.
+         * Determines whether the proposedData is not older than the currentData.
          *
          * @param currentData Maybe be null, if the proposedData is new to this canvas
          * @param proposedData Maybe not be null
@@ -59,8 +59,8 @@ nf.Client = (function() {
                 var currentRevision = currentData.revision;
                 var proposedRevision = proposedData.revision;
 
-                // return whether the proposed revision is newer
-                return proposedRevision.version > currentRevision.version;
+                // return whether the proposed revision is not less
+                return proposedRevision.version >= currentRevision.version;
             } else {
                 return true;
             }