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 2013/06/25 23:47:53 UTC
svn commit: r1496646 -
/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
Author: elecharny
Date: Tue Jun 25 21:47:53 2013
New Revision: 1496646
URL: http://svn.apache.org/r1496646
Log:
Fixed some potential NPE
Modified:
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java?rev=1496646&r1=1496645&r2=1496646&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/request/SearchRequestHandler.java Tue Jun 25 21:47:53 2013
@@ -920,6 +920,7 @@ public class SearchRequestHandler extend
catch ( LdapURLEncodingException e )
{
LOG.error( I18n.err( I18n.ERR_165, url, entry ) );
+ ldapUrl = new LdapUrl();
}
respRef.getReferral().addLdapUrl( ldapUrl.toString() );
@@ -1486,6 +1487,7 @@ public class SearchRequestHandler extend
catch ( LdapURLEncodingException e )
{
LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
+ ldapUrl = new LdapUrl();
}
// Normalize the Dn to check for same dn
@@ -1565,6 +1567,7 @@ public class SearchRequestHandler extend
catch ( LdapURLEncodingException e )
{
LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
+ ldapUrl = new LdapUrl();
}
Dn urlDn = new Dn( session.getCoreSession().getDirectoryService()