Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 14599 invoked from network); 5 Oct 2009 08:29:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Oct 2009 08:29:48 -0000 Received: (qmail 48610 invoked by uid 500); 5 Oct 2009 08:29:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 48548 invoked by uid 500); 5 Oct 2009 08:29:48 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 48538 invoked by uid 99); 5 Oct 2009 08:29:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Oct 2009 08:29:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Oct 2009 08:29:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 87DDA23888E9; Mon, 5 Oct 2009 08:28:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821718 - /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java Date: Mon, 05 Oct 2009 08:28:54 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091005082854.87DDA23888E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Mon Oct 5 08:28:54 2009 New Revision: 821718 URL: http://svn.apache.org/viewvc?rev=821718&view=rev Log: Fixed NullPointerException Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java?rev=821718&r1=821717&r2=821718&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java Mon Oct 5 08:28:54 2009 @@ -130,12 +130,15 @@ if ( input instanceof SearchResultEditorInput ) { SearchResultEditorInput srei = ( SearchResultEditorInput ) input; - for ( ISearchResult sr : srei.getSearch().getSearchResults() ) + if ( srei.getSearch() != null && srei.getSearch().getSearchResults() != null ) { - if ( modifiedEntry == sr.getEntry() ) + for ( ISearchResult sr : srei.getSearch().getSearchResults() ) { - // original entry has been updated, update widget input - setSearchResultEditorWidgetInput( srei ); + if ( modifiedEntry == sr.getEntry() ) + { + // original entry has been updated, update widget input + setSearchResultEditorWidgetInput( srei ); + } } } }