directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r722033 - /directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
Date Mon, 01 Dec 2008 10:59:08 GMT
Author: elecharny
Date: Mon Dec  1 02:59:06 2008
New Revision: 722033

URL: http://svn.apache.org/viewvc?rev=722033&view=rev
Log:
Removed some useless check : the entry is always a referral at this point (or inherit from
a referral)

Modified:
    directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java

Modified: directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=722033&r1=722032&r2=722033&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
(original)
+++ directory/apacheds/branches/apacheds-mina2/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
Mon Dec  1 02:59:06 2008
@@ -252,26 +252,17 @@
             {
                 try
                 {
-                    if ( isEntryReferral( entry ) )
+                    LOG.debug( "Entry is a referral: {}", entry );
+                    
+                    if ( req instanceof SearchRequest )
                     {
-                        LOG.debug( "Entry is a referral: {}", entry );
-                        
-                        if ( req instanceof SearchRequest )
-                        {
-                            handleReferralEntryForSearch( session, ( SearchRequest ) req,
entry );
-                        }
-                        else
-                        {
-                            handleReferralEntry( session, reqTargetDn, req, entry );
-                        }
-                        return;
+                        handleReferralEntryForSearch( session, ( SearchRequest ) req, entry
);
                     }
                     else
                     {
-                        LOG.debug( "Entry is NOT a referral: {}", entry );
-                        handleIgnoringReferrals( session, req );
-                        return;
+                        handleReferralEntry( session, reqTargetDn, req, entry );
                     }
+                    return;
                 }
                 catch ( Exception e )
                 {



Mime
View raw message