directory-commits mailing list archives

Author: akarasulu
Date: Wed Jul 23 17:51:38 2008
New Revision: 679252

URL: http://svn.apache.org/viewvc?rev=679252&view=rev
Log:
removing referral handling mode checks in server context until the jndi provider devises its
own checks

Modified:
    directory/apacheds/branches/bigbang/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java

Modified: directory/apacheds/branches/bigbang/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=679252&r1=679251&r2=679252&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
(original)
+++ directory/apacheds/branches/bigbang/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
Wed Jul 23 17:51:38 2008
@@ -23,7 +23,6 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DefaultCoreSession;
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.ReferralHandlingMode;
 import org.apache.directory.server.core.authn.LdapPrincipal;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -166,7 +165,6 @@
             props.getSaslMechanism(), props.getSaslAuthId() );
 
         session = opContext.getSession();
-        setReferralHandlingMode( env );
         
         if ( ! nexusProxy.hasEntry( new EntryOperationContext( session, dn ) ) )
         {
@@ -176,26 +174,6 @@
     
     
     /**
-     * Sets the referral handling mode on the CoreSession based on the 
-     * presence of a {@link Context#REFERRAL} environment property.
-     *
-     * @param env the environment to check
-     */
-    private void setReferralHandlingMode( Hashtable<String,Object> env )
-    {
-        if ( env.containsKey( Context.REFERRAL ) )
-        {
-            Object value = env.get( Context.REFERRAL );
-            
-            if ( value != null )
-            {
-                session.setReferralHandlingMode( ReferralHandlingMode.getModeFromJndi( (
String ) value ) );
-            }
-        }
-    }
-
-
-    /**
      * Must be called by all subclasses to initialize the nexus proxy and the
      * environment settings to be used by this Context implementation.  This
      * constructor is used to propagate new contexts from existing contexts.
@@ -609,18 +587,6 @@
      */
     public Object addToEnvironment( String propName, Object propVal ) throws NamingException
     {
-        if ( propName.equals( Context.REFERRAL ) )
-        {
-            if ( propVal != null )
-            {
-                session.setReferralHandlingMode( ReferralHandlingMode.getModeFromJndi( (
String ) propVal ) );
-            }
-            else
-            {
-                session.setReferralHandlingMode( ReferralHandlingMode.IGNORE );
-            }
-        }
-        
         return env.put( propName, propVal );
     }
 
@@ -630,11 +596,6 @@
      */
     public Object removeFromEnvironment( String propName ) throws NamingException
     {
-        if ( propName.equals( Context.REFERRAL ) )
-        {
-            session.setReferralHandlingMode( ReferralHandlingMode.IGNORE );
-        }
-        
         return env.remove( propName );
     }