directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r570981 - /directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
Date Wed, 29 Aug 2007 23:25:45 GMT
Author: ccustine
Date: Wed Aug 29 16:25:44 2007
New Revision: 570981

URL: http://svn.apache.org/viewvc?rev=570981&view=rev
Log:
- DIRSERVER-1046 Make ldifDirectory relative to isntance home if it is a relative path

Modified:
    directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java?rev=570981&r1=570980&r2=570981&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
(original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
Wed Aug 29 16:25:44 2007
@@ -91,7 +91,14 @@
 
     public File getLdifDirectory()
     {
-        return this.ldifDirectory;
+        if ( ldifDirectory.isAbsolute() )
+        {
+            return this.ldifDirectory;
+        }
+        else
+        {
+            return new File( getWorkingDirectory() , ldifDirectory.toString() );
+        }
     }
 
 



Mime
View raw message