You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/05/01 11:32:39 UTC
svn commit: r770597 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core:
DefaultDirectoryService.java journal/DefaultJournal.java
journal/JournalInterceptor.java
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();