directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r823133 - /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/MultiTabEntryEditorMatchingStrategy.java
Date Thu, 08 Oct 2009 11:33:21 GMT
Author: seelmann
Date: Thu Oct  8 11:33:20 2009
New Revision: 823133

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

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

Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/MultiTabEntryEditorMatchingStrategy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/MultiTabEntryEditorMatchingStrategy.java?rev=823133&r1=823132&r2=823133&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/MultiTabEntryEditorMatchingStrategy.java
(original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/entryeditors/MultiTabEntryEditorMatchingStrategy.java
Thu Oct  8 11:33:20 2009
@@ -69,7 +69,12 @@
                 return false;
             }
             EntryEditorInput otherEntryEditorInput = ( EntryEditorInput ) otherInput;
-            return entryEditorInput.getResolvedEntry().equals( otherEntryEditorInput.getResolvedEntry()
);
+            if ( entryEditorInput.getResolvedEntry() == null && otherEntryEditorInput.getResolvedEntry()
== null )
+            {
+                return true;
+            }
+            return entryEditorInput.getResolvedEntry() != null && otherEntryEditorInput.getResolvedEntry()
!= null
+                && entryEditorInput.getResolvedEntry().equals( otherEntryEditorInput.getResolvedEntry()
);
         }
         catch ( PartInitException e )
         {



Mime
View raw message