directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r822912 - /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
Date Wed, 07 Oct 2009 20:59:55 GMT
Author: seelmann
Date: Wed Oct  7 20:59:53 2009
New Revision: 822912

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

Modified:
    directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java?rev=822912&r1=822911&r2=822912&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
Wed Oct  7 20:59:53 2009
@@ -343,7 +343,7 @@
                 for ( IEditorReference ref : activePage.getEditorReferences() )
                 {
                     IEntryEditor editor = getEntryEditor( ref );
-                    if ( editor != null )
+                    if ( editor != null && editor.getEntryEditorInput().getResolvedEntry()
!= null )
                     {
                         IBrowserConnection bc = editor.getEntryEditorInput().getResolvedEntry().getBrowserConnection();
                         LdapDN dn = editor.getEntryEditorInput().getResolvedEntry().getDn();
@@ -1023,7 +1023,7 @@
             if ( editor != null )
             {
                 EntryEditorInput input = editor.getEntryEditorInput();
-                if ( input != null )
+                if ( input != null && input.getResolvedEntry() != null  )
                 {
                     IEntry entry = input.getResolvedEntry();
                     if ( editor.isAutoSave() )



Mime
View raw message