directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r613683 - /directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java
Date Sun, 20 Jan 2008 21:26:50 GMT
Author: seelmann
Date: Sun Jan 20 13:26:49 2008
New Revision: 613683

URL: http://svn.apache.org/viewvc?rev=613683&view=rev
Log:
Fixed NPE

Modified:
    directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java?rev=613683&r1=613682&r2=613683&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java
(original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeAttributesJob.java
Sun Jan 20 13:26:49 2008
@@ -349,12 +349,15 @@
         
         // get other meta data entries
         IAttribute[] rootDseAttributes = browserConnection.getRootDSE().getAttributes();
-        for ( IAttribute attribute : rootDseAttributes )
+        if ( rootDseAttributes != null )
         {
-            IEntry[] metadataEntries = getDirectoryMetadataEntries( browserConnection, attribute.getDescription()
);
-            for ( IEntry entry : metadataEntries )
+            for ( IAttribute attribute : rootDseAttributes )
             {
-                rootDseEntries.put( entry.getDn(), entry );
+                IEntry[] metadataEntries = getDirectoryMetadataEntries( browserConnection,
attribute.getDescription() );
+                for ( IEntry entry : metadataEntries )
+                {
+                    rootDseEntries.put( entry.getDn(), entry );
+                }
             }
         }
         



Mime
View raw message