Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 EF000184CC for ; Thu, 10 Mar 2016 17:47:16 +0000 (UTC) Received: (qmail 7525 invoked by uid 500); 10 Mar 2016 17:47:16 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 7483 invoked by uid 500); 10 Mar 2016 17:47:16 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 7454 invoked by uid 99); 10 Mar 2016 17:47:16 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Mar 2016 17:47:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 49C8FC035F for ; Thu, 10 Mar 2016 17:47:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id l4M7B-L7lKNJ for ; Thu, 10 Mar 2016 17:47:14 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id E3BA15F1BE for ; Thu, 10 Mar 2016 17:47:13 +0000 (UTC) Received: (qmail 7339 invoked by uid 99); 10 Mar 2016 17:47:13 -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, 10 Mar 2016 17:47:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3EF4DDFA0B; Thu, 10 Mar 2016 17:47:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hiteshkhamesra@apache.org To: commits@geode.incubator.apache.org Date: Thu, 10 Mar 2016 17:47:16 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] incubator-geode git commit: GEODE-1064 Now we pass correct sever in getCredentail call GEODE-1064 Now we pass correct sever in getCredentail call Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/41f4f14a Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/41f4f14a Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/41f4f14a Branch: refs/heads/develop Commit: 41f4f14ae683021f5e3ba77a1cb7c4673928a9f4 Parents: b91a22b Author: Hitesh Khamesra Authored: Wed Mar 9 12:20:31 2016 -0800 Committer: Hitesh Khamesra Committed: Thu Mar 10 09:47:24 2016 -0800 ---------------------------------------------------------------------- .../gemstone/gemfire/internal/cache/tier/sockets/HandShake.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/41f4f14a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java old mode 100755 new mode 100644 index 100549a..2ea6ca0 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java @@ -1837,8 +1837,7 @@ public class HandShake implements ClientHandShake public void sendCredentialsForWan(OutputStream out, InputStream in) { try { - Properties wanCredentials = getCredentials(this.system - .getDistributedMember()); + Properties wanCredentials = getCredentials(this.id.getDistributedMember()); DataOutputStream dos = new DataOutputStream(out); DataInputStream dis = new DataInputStream(in); writeCredentials(dos, dis, wanCredentials, false, this.system.getDistributedMember());