You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/03/11 15:13:31 UTC
svn commit: r1665881 -
/directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
Author: elecharny
Date: Wed Mar 11 14:13:31 2015
New Revision: 1665881
URL: http://svn.apache.org/r1665881
Log:
Fixed a potential NPE (DIRSTUDIO-993) :
java.lang.NullPointerException
at org.apache.directory.studio.ldapbrowser.common.wizards.NewEntryDnWizardPage.loadState(NewEntryDnWizardPage.java:189)
...
Modified:
directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
Modified: directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1665881&r1=1665880&r2=1665881&view=diff
==============================================================================
--- directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original)
+++ directory/studio/branches/studio-tycho/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Wed Mar 11 14:13:31 2015
@@ -186,10 +186,11 @@ public class NewEntryDnWizardPage extend
boolean hasSelectedEntry = wizard.getSelectedEntry() != null;
boolean newEntryParentDnNotNullOrEmpty = !Dn.isNullOrEmpty( newEntry.getDn().getParent() );
- boolean newEntryDnEqualsSelectedEntryDn = newEntry.getDn().equals( wizard.getSelectedEntry().getDn() );
if ( hasSelectedEntry )
{
+ boolean newEntryDnEqualsSelectedEntryDn = newEntry.getDn().equals( wizard.getSelectedEntry().getDn() );
+
if ( newEntryDnEqualsSelectedEntryDn && newEntryParentDnNotNullOrEmpty )
{
parentDn = newEntry.getDn().getParent();