Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 44178 invoked from network); 1 May 2009 09:33:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 May 2009 09:33:03 -0000 Received: (qmail 22133 invoked by uid 500); 1 May 2009 09:33:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22076 invoked by uid 500); 1 May 2009 09:33:03 -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 22067 invoked by uid 99); 1 May 2009 09:33:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 May 2009 09:33:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 01 May 2009 09:33:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF45423889F6; Fri, 1 May 2009 09:32:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r770597 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: DefaultDirectoryService.java journal/DefaultJournal.java journal/JournalInterceptor.java Date: Fri, 01 May 2009 09:32:39 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090501093239.CF45423889F6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri May 1 09:32:37 2009 New Revision: 770597 URL: http://svn.apache.org/viewvc?rev=770597&view=rev Log: Ooops... Without those small modifications, the tests ends with a hell lot of NPE :/ My bad. Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=770597&r1=770596&r2=770597&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri May 1 09:32:37 2009 @@ -938,9 +938,12 @@ changeLog.destroy(); // -------------------------------------------------------------------- - // Shutdown the journal + // Shutdown the journal if enabled // -------------------------------------------------------------------- - journal.destroy(); + if ( journal.isEnabled() ) + { + journal.destroy(); + } // -------------------------------------------------------------------- // Shutdown the partition Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=770597&r1=770596&r2=770597&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Fri May 1 09:32:37 2009 @@ -53,7 +53,10 @@ // We have to release the file, otherwise Windows won't be able // to stop the server - store.destroy(); + if ( store != null ) + { + store.destroy(); + } } Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=770597&r1=770596&r2=770597&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Fri May 1 09:32:37 2009 @@ -79,7 +79,7 @@ { super.init( directoryService ); - //if ( directoryService.getJournal().isEnabled() ) + if ( directoryService.getJournal().isEnabled() ) { journalEnabled = true; journal = directoryService.getJournal();