Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 36FEA200C09 for ; Wed, 25 Jan 2017 10:48:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 359D1160B50; Wed, 25 Jan 2017 09:48:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 804E4160B4E for ; Wed, 25 Jan 2017 10:48:18 +0100 (CET) Received: (qmail 54342 invoked by uid 500); 25 Jan 2017 09:48:17 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 54333 invoked by uid 99); 25 Jan 2017 09:48:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2017 09:48:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D282DFA69; Wed, 25 Jan 2017 09:48:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1596 Fixed version sort. Date: Wed, 25 Jan 2017 09:48:17 +0000 (UTC) archived-at: Wed, 25 Jan 2017 09:48:19 -0000 Repository: ignite Updated Branches: refs/heads/master ef04f35fa -> 128ba0733 IGNITE-1596 Fixed version sort. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/128ba073 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/128ba073 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/128ba073 Branch: refs/heads/master Commit: 128ba0733692178de05eae183b97355b81715a1b Parents: ef04f35 Author: Andrey Novikov Authored: Wed Jan 25 16:48:05 2017 +0700 Committer: Andrey Novikov Committed: Wed Jan 25 16:48:05 2017 +0700 ---------------------------------------------------------------------- modules/web-console/backend/app/agent.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/128ba073/modules/web-console/backend/app/agent.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/agent.js b/modules/web-console/backend/app/agent.js index 791ea50..961253f 100644 --- a/modules/web-console/backend/app/agent.js +++ b/modules/web-console/backend/app/agent.js @@ -650,14 +650,14 @@ module.exports.factory = function(_, fs, path, JSZip, socketio, settings, mongo) const bParts = b.split('.'); for (let i = 0; i < aParts.length; ++i) { - if (bParts.length === i) - return 1; + if (aParts[i] !== bParts[i]) + return aParts[i] < bParts[i] ? 1 : -1; + } - if (aParts[i] === aParts[i]) - continue; + if (aParts.length === bParts.length) + return 0; - return aParts[i] > bParts[i] ? 1 : -1; - } + return aParts.length < bParts.length ? 1 : -1; })); // Latest version of agent distribution.