You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2016/09/14 20:41:02 UTC
svn commit: r1760754 -
/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
Author: seelmann
Date: Wed Sep 14 20:41:02 2016
New Revision: 1760754
URL: http://svn.apache.org/viewvc?rev=1760754&view=rev
Log:
Fix NPE
Modified:
directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=1760754&r1=1760753&r2=1760754&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java Wed Sep 14 20:41:02 2016
@@ -358,22 +358,25 @@ public class EntryEditorManager
for ( IEditorReference ref : activePage.getEditorReferences() )
{
IEntryEditor editor = getEntryEditor( ref );
- EntryEditorInput entryEditorInput = editor.getEntryEditorInput();
-
- if ( entryEditorInput != null )
+ if ( editor != null )
{
- IEntry resolvedEntry = entryEditorInput.getResolvedEntry();
-
- if ( ( editor != null ) && ( resolvedEntry != null ) )
- {
- IBrowserConnection bc = resolvedEntry.getBrowserConnection();
- Dn dn = resolvedEntry.getDn();
-
- if ( bc.getEntryFromCache( dn ) == null )
- {
- editorReferences.add( ref );
- }
- }
+ EntryEditorInput entryEditorInput = editor.getEntryEditorInput();
+
+ if ( entryEditorInput != null )
+ {
+ IEntry resolvedEntry = entryEditorInput.getResolvedEntry();
+
+ if ( ( editor != null ) && ( resolvedEntry != null ) )
+ {
+ IBrowserConnection bc = resolvedEntry.getBrowserConnection();
+ Dn dn = resolvedEntry.getDn();
+
+ if ( bc.getEntryFromCache( dn ) == null )
+ {
+ editorReferences.add( ref );
+ }
+ }
+ }
}
}