Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E9E3E1066E for ; Thu, 14 May 2015 12:52:03 +0000 (UTC) Received: (qmail 63401 invoked by uid 500); 14 May 2015 12:52:03 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 63359 invoked by uid 500); 14 May 2015 12:52:03 -0000 Mailing-List: contact commits-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 commits@activemq.apache.org Received: (qmail 63349 invoked by uid 99); 14 May 2015 12:52:03 -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, 14 May 2015 12:52:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADD44E051A; Thu, 14 May 2015 12:52:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: <67e1bb7c70c44a3096eb5d206d31e09a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-4705 - ensure cached lastModified is externally visible - hardened test showed window for missed mod Date: Thu, 14 May 2015 12:52:03 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/master fee7c1cf4 -> 181e4d461 https://issues.apache.org/jira/browse/AMQ-4705 - ensure cached lastModified is externally visible - hardened test showed window for missed mod Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/181e4d46 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/181e4d46 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/181e4d46 Branch: refs/heads/master Commit: 181e4d461758acb9910615213db8d400277309d6 Parents: fee7c1c Author: gtully Authored: Thu May 14 13:48:14 2015 +0100 Committer: gtully Committed: Thu May 14 13:48:14 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/util/LockFile.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/181e4d46/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java b/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java index 4f99abe..45e26ca 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java +++ b/activemq-broker/src/main/java/org/apache/activemq/util/LockFile.java @@ -83,6 +83,7 @@ public class LockFile { } if (lock != null) { //Set lastModified only if we are able to successfully obtain the lock. + readFile.getChannel().force(true); lastModified = file.lastModified(); lockCounter++; System.setProperty(getVmLockKey(), new Date().toString());