directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r949385 - /directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
Date Sat, 29 May 2010 13:10:06 GMT
Author: elecharny
Date: Sat May 29 13:10:05 2010
New Revision: 949385

URL: http://svn.apache.org/viewvc?rev=949385&view=rev
Log:
Revert the previous commit.

Modified:
    directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java

Modified: directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java?rev=949385&r1=949384&r2=949385&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
(original)
+++ directory/apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/DefaultDirectoryServiceFactory.java
Sat May 29 13:10:05 2010
@@ -20,7 +20,6 @@ package org.apache.directory.server.core
 
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
@@ -110,7 +109,7 @@ public class DefaultDirectoryServiceFact
      */
     public void init( String name ) throws Exception
     {
-        if ( directoryService != null && directoryService.isStarted() )
+        if ( ( directoryService != null ) && directoryService.isStarted() )
         {
             return;
         }
@@ -211,14 +210,7 @@ public class DefaultDirectoryServiceFact
         String workingDirectoryPath = directoryService.getWorkingDirectory().getPath();
         File workingDirectory = new File( workingDirectoryPath );
 
-        try
-        {
-            FileUtils.deleteDirectory( workingDirectory );
-        }
-        catch ( IOException ioe )
-        {
-            // Ok, not a big deal.
-        }
+        FileUtils.deleteDirectory( workingDirectory );
 
         // Init the service now
         initSchema();



Mime
View raw message