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/02/13 18:39:56 UTC
svn commit: r1659623 -
/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
Author: elecharny
Date: Fri Feb 13 17:39:55 2015
New Revision: 1659623
URL: http://svn.apache.org/r1659623
Log:
o Added a protection against a potential NPE if one attribute is null
Modified:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java?rev=1659623&r1=1659622&r2=1659623&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/message/SearchRequestImpl.java Fri Feb 13 17:39:55 2015
@@ -70,7 +70,7 @@ public class SearchRequestImpl extends A
/** The final result containing SearchResponseDone response */
private SearchResultDone response;
-
+
/** A flag set to tell the search what to do wth referrals */
private ReferralsPolicyEnum referralHandling = ReferralsPolicyEnum.THROW;
@@ -370,7 +370,10 @@ public class SearchRequestImpl extends A
// Order doesn't matter, thus just add hashCode
for ( String attr : attributes )
{
- hash = hash + attr.hashCode();
+ if ( attr != null )
+ {
+ hash = hash + attr.hashCode();
+ }
}
}
@@ -591,8 +594,8 @@ public class SearchRequestImpl extends A
return super.toString( sb.toString() );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -608,11 +611,11 @@ public class SearchRequestImpl extends A
public SearchRequest followReferrals()
{
referralHandling = ReferralsPolicyEnum.FOLLOW;
-
+
return this;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -628,7 +631,7 @@ public class SearchRequestImpl extends A
public SearchRequest ignoreReferrals()
{
referralHandling = ReferralsPolicyEnum.IGNORE;
-
+
return this;
}
}
\ No newline at end of file