Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71258186C2 for ; Thu, 23 Jul 2015 13:06:08 +0000 (UTC) Received: (qmail 38563 invoked by uid 500); 23 Jul 2015 13:06:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 38533 invoked by uid 500); 23 Jul 2015 13:06:08 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 38523 invoked by uid 99); 23 Jul 2015 13:06:08 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jul 2015 13:06:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id EDA1518D190 for ; Thu, 23 Jul 2015 13:06:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id SCfWpEKzOUZI for ; Thu, 23 Jul 2015 13:05:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 3A823215D6 for ; Thu, 23 Jul 2015 13:05:59 +0000 (UTC) Received: (qmail 38261 invoked by uid 99); 23 Jul 2015 13:05:59 -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; Thu, 23 Jul 2015 13:05:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10C43E6810; Thu, 23 Jul 2015 13:05:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <5d1c98ccf77345e4a4496b56f14d71c3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: Decrease write buffer to avoid double sending. Date: Thu, 23 Jul 2015 13:05:59 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-1.3.3 6b84399d7 -> 65feef6d2 Decrease write buffer to avoid double sending. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/65feef6d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/65feef6d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/65feef6d Branch: refs/heads/ignite-1.3.3 Commit: 65feef6d2d9bbe0ac19d1496f472c0ee06ef0b04 Parents: 6b84399 Author: nikolay_tikhonov Authored: Thu Jul 23 16:05:33 2015 +0300 Committer: nikolay_tikhonov Committed: Thu Jul 23 16:06:06 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/util/nio/GridNioServer.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65feef6d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 24e1e08..d3f439a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -977,8 +977,14 @@ public class GridNioServer { buf = sslFilter.encrypt(ses, sesBuf); + int expand = sesBuf.limit() - buf.limit(); + sesBuf.clear(); + // SSL data more then socket buffer size + if (expand < 0) + sesBuf.limit(sesBuf.limit() + expand - 100); + assert buf.hasRemaining(); if (!skipWrite) {