directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r524024 - /directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java
Date Fri, 30 Mar 2007 10:12:16 GMT
Author: seelmann
Date: Fri Mar 30 03:12:09 2007
New Revision: 524024

URL: http://svn.apache.org/viewvc?view=rev&rev=524024
Log:
Fix for DIRSTUDIO-69. Removed initialization of searchBase because the java.beans.XMLEncoder
has problems to serialize the object correctly.

Modified:
    directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java

Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java?view=diff&rev=524024&r1=524023&r2=524024
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java
(original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/SearchParameter.java
Fri Mar 30 03:12:09 2007
@@ -78,7 +78,7 @@
      * Creates a new instance of SearchParameter with default search parameters:
      * <ul>
      * <li>null search name
-     * <li>empty search base
+     * <li>null search base
      * <li>default filter (objectClass=*)
      * <li>no returning attributes
      * <li>search scope one level
@@ -94,7 +94,7 @@
     public SearchParameter()
     {
         name = null;
-        searchBase = ISearch.EMPTY_SEARCH_BASE;
+        searchBase = null;
         filter = ISearch.FILTER_TRUE;
         returningAttributes = ISearch.NO_ATTRIBUTES;
         scope = ISearch.SCOPE_ONELEVEL;
@@ -293,17 +293,13 @@
 
 
     /**
-     * Sets the search base, a null search base will be
-     * transformed to an empty DN.
+     * Sets the search base, a null search base is not allowed.
      * 
      * @param searchBase the search base
      */
     public void setSearchBase( DN searchBase )
     {
-        if ( searchBase == null )
-        {
-            searchBase = ISearch.EMPTY_SEARCH_BASE;
-        }
+        assert searchBase != null;
         this.searchBase = searchBase;
     }
 



Mime
View raw message