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 B79C7EFDA for ; Thu, 7 Feb 2013 14:17:17 +0000 (UTC) Received: (qmail 69117 invoked by uid 500); 7 Feb 2013 14:17:17 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 69096 invoked by uid 500); 7 Feb 2013 14:17:17 -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 69085 invoked by uid 99); 7 Feb 2013 14:17:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 14:17:17 +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; Thu, 07 Feb 2013 14:17:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2134E23888CD; Thu, 7 Feb 2013 14:16:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443497 - in /jackrabbit/oak/trunk/oak-mongomk/src: main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java Date: Thu, 07 Feb 2013 14:16:55 -0000 To: oak-commits@jackrabbit.apache.org From: meteatamel@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130207141655.2134E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: meteatamel Date: Thu Feb 7 14:16:54 2013 New Revision: 1443497 URL: http://svn.apache.org/viewvc?rev=1443497&view=rev Log: Fixed a minor bug encountered in getNodes call with -1 (limitless) depth Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java?rev=1443497&r1=1443496&r2=1443497&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java Thu Feb 7 14:16:54 2013 @@ -190,6 +190,7 @@ public class MongoMicroKernel implements } JsopBuilder builder = new JsopBuilder().object(); + depth = depth == -1? Integer.MAX_VALUE : depth; JsonUtil.toJson(builder, new MongoNodeState(rootNode), depth, (int)offset, maxChildNodes, true, nodeFilter); return builder.endObject().toString(); } catch (Exception e) { Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java?rev=1443497&r1=1443496&r2=1443497&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java (original) +++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java Thu Feb 7 14:16:54 2013 @@ -104,8 +104,7 @@ public class MongoMKGetNodesTest extends SimpleNodeScenario scenario = new SimpleNodeScenario(mk); scenario.create(); - // FIXME - depth > 3449 does not work. - JSONObject root = parseJSONObject(mk.getNodes("/", null, 3449, 0, -1, null)); + JSONObject root = parseJSONObject(mk.getNodes("/", null, -1, 0, -1, null)); assertPropertyValue(root, ":childNodeCount", 1L); JSONObject a = resolveObjectValue(root, "a");