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 2A4C1200D09 for ; Tue, 12 Sep 2017 18:38:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 28FA01609C7; Tue, 12 Sep 2017 16:38:22 +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 632221609B4 for ; Tue, 12 Sep 2017 18:38:21 +0200 (CEST) Received: (qmail 93238 invoked by uid 500); 12 Sep 2017 16:38:20 -0000 Mailing-List: contact dev-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list dev@activemq.apache.org Received: (qmail 93227 invoked by uid 99); 12 Sep 2017 16:38:20 -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; Tue, 12 Sep 2017 16:38:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 272BBF5724; Tue, 12 Sep 2017 16:38:20 +0000 (UTC) From: michaelandrepearce To: dev@activemq.apache.org Reply-To: dev@activemq.apache.org References: In-Reply-To: Subject: [GitHub] activemq-artemis pull request #1530: ARTEMIS-1417 Failback not working on NF... Content-Type: text/plain Message-Id: <20170912163820.272BBF5724@git1-us-west.apache.org> Date: Tue, 12 Sep 2017 16:38:20 +0000 (UTC) archived-at: Tue, 12 Sep 2017 16:38:22 -0000 Github user michaelandrepearce commented on a diff in the pull request: https://github.com/apache/activemq-artemis/pull/1530#discussion_r138402896 --- Diff: artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/FileLockNodeManager.java --- @@ -267,25 +293,27 @@ public final SimpleString readNodeId() throws ActiveMQIllegalStateException, IOE return getNodeId(); } - protected FileLock tryLock(final int lockPos) throws Exception { + protected FileLock tryLock(final long lockPos) throws IOException { --- End diff -- lock is changed from int to long here, was there a need? if so other methods such as lock should be updated, if not this should be reverted ---