Author: pamarcelot
Date: Fri Dec  4 16:20:09 2009
New Revision: 887250

URL: http://svn.apache.org/viewvc?rev=887250&view=rev
Log:
Fix for DIRSTUDIO-601 (The 'Perform Search/Search Again' button in the Search Result Editor does not work correctly).

The previous fix was breaking things, especially the Quick Search.
This new fix should not break anything.

Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java?rev=887250&r1=887249&r2=887250&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RefreshAction.java Fri Dec  4 16:20:09 2009
@@ -176,9 +176,11 @@
         }
         if ( searchInput != null )
         {
-            searchInput.setSearchResults( null );
+            // the search input is usually a cloned search, lookup the real search from connection
+            ISearch search = searchInput.getBrowserConnection().getSearchManager().getSearch( searchInput.getName() );
+            search.setSearchResults( null );
             new StudioBrowserJob( new SearchRunnable( new ISearch[]
-                { searchInput } ) ).execute();
+                { search } ) ).execute();
         }
     }
 

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=887250&r1=887249&r2=887250&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Fri Dec  4 16:20:09 2009
@@ -162,10 +162,6 @@
             ISearch search = searches[pi];
             ISearch searchToPerform = searchesToPerform[pi];
             
-            // Making sure we have the original search objects and not clones
-            search = search.getBrowserConnection().getSearchManager().getSearch( search.getName() );
-            searchToPerform = searchToPerform.getBrowserConnection().getSearchManager().getSearch( searchToPerform.getName() );
-
             monitor.setTaskName( BrowserCoreMessages.bind( BrowserCoreMessages.jobs__search_task, new String[]
                 { search.getName() } ) );
             monitor.worked( 1 );