Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-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 AD188DF30 for ; Mon, 11 Mar 2013 10:45:26 +0000 (UTC) Received: (qmail 5118 invoked by uid 500); 11 Mar 2013 10:45:26 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 4995 invoked by uid 500); 11 Mar 2013 10:45:25 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 4913 invoked by uid 99); 11 Mar 2013 10:45:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 10:45:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 10:44:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C29B23889E0; Mon, 11 Mar 2013 10:44:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1455090 - /jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Date: Mon, 11 Mar 2013 10:44:31 -0000 To: oak-commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130311104431.1C29B23889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Mon Mar 11 10:44:30 2013 New Revision: 1455090 URL: http://svn.apache.org/r1455090 Log: OAK-619 Lock-free MongoMK implementation - use head revision when revisionId is null Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java?rev=1455090&r1=1455089&r2=1455090&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java Mon Mar 11 10:44:30 2013 @@ -444,6 +444,7 @@ public class MongoMK implements MicroKer @Override public boolean nodeExists(String path, String revisionId) throws MicroKernelException { + revisionId = revisionId != null ? revisionId : headRevision.toString(); Revision rev = Revision.fromString(stripBranchRevMarker(revisionId)); Node n = getNode(path, rev); return n != null; @@ -463,6 +464,7 @@ public class MongoMK implements MicroKer if (depth != 0) { throw new MicroKernelException("Only depth 0 is supported, depth is " + depth); } + revisionId = revisionId != null ? revisionId : headRevision.toString(); if (revisionId.startsWith("b")) { // reading from the branch is reading from the trunk currently revisionId = revisionId.substring(1).replace('+', ' ').trim();