directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r691317 - /directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Date Tue, 02 Sep 2008 16:54:03 GMT
Author: elecharny
Date: Tue Sep  2 09:54:03 2008
New Revision: 691317

URL: http://svn.apache.org/viewvc?rev=691317&view=rev
Log:
Fixed a NPE when trying to read an operational attribute, as we were using the clonedServerEntry,
not the original entry.

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

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=691317&r1=691316&r2=691317&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
(original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Tue Sep  2 09:54:03 2008
@@ -353,7 +353,7 @@
         
         if ( fileEntry != null )
         {
-            String time = fileEntry.get( SchemaConstants.CREATE_TIMESTAMP_AT ).getString();
+            String time = ((ClonedServerEntry)fileEntry).getOriginalEntry().get( SchemaConstants.CREATE_TIMESTAMP_AT
).getString();
             LOG.info( "Load of LDIF file '" + getCanonical( ldifFile )
                     + "' skipped.  It has already been loaded on " + time + "." );
         }



Mime
View raw message