directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1459356 - /directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
Date Thu, 21 Mar 2013 15:25:21 GMT
Author: pamarcelot
Date: Thu Mar 21 15:25:21 2013
New Revision: 1459356

URL: http://svn.apache.org/r1459356
Log:
Potential fix for DIRSTUDIO-865 (NullPointerException thrown when connecting to Domino 8.5.2FP3
LDAP).

Modified:
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=1459356&r1=1459355&r2=1459356&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java
Thu Mar 21 15:25:21 2013
@@ -412,11 +412,16 @@ public class InitializeRootDSERunnable i
             ISearch.NO_ATTRIBUTES, SearchScope.ONELEVEL, 0, 0, Connection.AliasDereferencingMethod.NEVER,
             Connection.ReferralHandlingMethod.IGNORE, false, null );
         SearchRunnable.searchAndUpdateModel( browserConnection, search, monitor );
+
         ISearchResult[] results = search.getSearchResults();
-        for ( ISearchResult searchResult : results )
+
+        if ( results != null )
         {
-            IEntry entry = searchResult.getEntry();
-            rootDseEntries.put( entry.getDn(), entry );
+            for ( ISearchResult searchResult : results )
+            {
+                IEntry entry = searchResult.getEntry();
+                rootDseEntries.put( entry.getDn(), entry );
+            }
         }
     }
 }



Mime
View raw message