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 2012/02/21 16:03:45 UTC

svn commit: r1291839 - /directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java

Author: pamarcelot
Date: Tue Feb 21 15:03:45 2012
New Revision: 1291839

URL: http://svn.apache.org/viewvc?rev=1291839&view=rev
Log:
Fixed a potential NPE when using the setBrowserConnection() method before the createWidget() method is called.

Modified:
    directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java?rev=1291839&r1=1291838&r2=1291839&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/FilterWidget.java Tue Feb 21 15:03:45 2012
@@ -221,9 +221,13 @@ public class FilterWidget extends Browse
         if ( this.browserConnection != browserConnection )
         {
             this.browserConnection = browserConnection;
-            contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
-            filterCPA.setAutoActivationCharacters( contentAssistProcessor
-                .getCompletionProposalAutoActivationCharacters() );
+
+            if ( filterCombo != null )
+            {
+                contentAssistProcessor.setSchema( browserConnection == null ? null : browserConnection.getSchema() );
+                filterCPA.setAutoActivationCharacters( contentAssistProcessor
+                    .getCompletionProposalAutoActivationCharacters() );
+            }
         }
     }