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 3336A2009F3 for ; Fri, 20 May 2016 17:21:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3194F160A24; Fri, 20 May 2016 15:21: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 9FCCC160A0E for ; Fri, 20 May 2016 17:21:18 +0200 (CEST) Received: (qmail 39171 invoked by uid 500); 20 May 2016 15:21:17 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 39110 invoked by uid 99); 20 May 2016 15:21: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; Fri, 20 May 2016 15:21:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 983FBE0579; Fri, 20 May 2016 15:21:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Fri, 20 May 2016 15:21:18 -0000 Message-Id: <469beec287bb47fc89aeb9d7eb662733@git.apache.org> In-Reply-To: <77f597c15e2b49b58d0516d629af2af0@git.apache.org> References: <77f597c15e2b49b58d0516d629af2af0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 570b676 archived-at: Fri, 20 May 2016 15:21:19 -0000 Merge pull request #1549 from shapeblue/nio-fixagain-singlepr CLOUDSTACK-9348: NioConnection improvementsReopened PR with squashed changes for a re-review and testing after https://github.com/apache/cloudstack/pull/1493 and sub-sequent PRs got reverted * pr/1549: CLOUDSTACK-9348: NioConnection improvements Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/570b676b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/570b676b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/570b676b Branch: refs/heads/master Commit: 570b676b1fd9bb932825e43f1844e147b1ddf7f6 Parents: cb55624 9c75186 Author: Will Stevens Authored: Fri May 20 11:20:48 2016 -0400 Committer: Will Stevens Committed: Fri May 20 11:20:49 2016 -0400 ---------------------------------------------------------------------- .../manager/ClusteredAgentManagerImpl.java | 9 +- .../src/main/java/com/cloud/utils/nio/Link.java | 297 ++++++++++++------- .../java/com/cloud/utils/nio/NioClient.java | 31 +- .../java/com/cloud/utils/nio/NioConnection.java | 86 +++--- .../java/com/cloud/utils/nio/NioServer.java | 6 +- .../java/com/cloud/utils/testcase/NioTest.java | 249 ++++++++++------ 6 files changed, 408 insertions(+), 270 deletions(-) ----------------------------------------------------------------------