You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2013/01/29 17:23:04 UTC
svn commit: r1439980 -
/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
Author: pamarcelot
Date: Tue Jan 29 16:23:04 2013
New Revision: 1439980
URL: http://svn.apache.org/viewvc?rev=1439980&view=rev
Log:
Potential fix for DIRSTUDIO-865 (NullPointerException thrown when connecting to Domino 7.1 LDAP).
Modified:
directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=1439980&r1=1439979&r2=1439980&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Tue Jan 29 16:23:04 2013
@@ -342,6 +342,13 @@ public class SearchRunnable implements S
if ( entry == null )
{
entry = createAndCacheEntry( resultBrowserConnection, dn, monitor );
+
+ // If the entry is still null, we return
+ // See https://issues.apache.org/jira/browse/DIRSTUDIO-865
+ if ( entry == null )
+ {
+ return;
+ }
}
// initialize special flags