Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 DF6AFD8E8 for ; Mon, 24 Sep 2012 11:29:04 +0000 (UTC) Received: (qmail 11695 invoked by uid 500); 24 Sep 2012 11:29:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 11534 invoked by uid 500); 24 Sep 2012 11:28:59 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 11502 invoked by uid 99); 24 Sep 2012 11:28:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2012 11:28:58 +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, 24 Sep 2012 11:28:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5174F23889C5 for ; Mon, 24 Sep 2012 11:28:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1389301 - /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Date: Mon, 24 Sep 2012 11:28:12 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120924112812.5174F23889C5@eris.apache.org> Author: pamarcelot Date: Mon Sep 24 11:28:11 2012 New Revision: 1389301 URL: http://svn.apache.org/viewvc?rev=1389301&view=rev Log: Fixed compilation failure due to recent merge from elecharny and the change of the AbstractBTreePartition API (which is no longer parametric). Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1389301&r1=1389300&r2=1389301&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Mon Sep 24 11:28:11 2012 @@ -245,7 +245,7 @@ public class LoadConfigurationRunnable i * the associated configuration bean * @throws LdapException */ - private static ConfigBean readConfiguration( AbstractBTreePartition partition ) throws LdapException + private static ConfigBean readConfiguration( AbstractBTreePartition partition ) throws LdapException { if ( partition != null ) {