Author: gokturk
Date: Fri Nov 18 12:00:07 2011
New Revision: 1203616
URL: http://svn.apache.org/viewvc?rev=1203616&view=rev
Log:
Fix for conflict
Modified:
directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1203616&r1=1203615&r2=1203616&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Fri Nov 18 12:00:07 2011
@@ -146,30 +146,6 @@ public class AuthenticationInterceptor e
/**
- * the set of interceptors we should *not* go through when pwdpolicy state information
is being updated
- */
- private static final Collection<String> BYPASS_INTERCEPTORS;
-
- static
- {
- Set<String> c = new HashSet<String>();
- c.add( "NormalizationInterceptor" );
- c.add( "AuthenticationInterceptor" );
- c.add( "AciAuthorizationInterceptor" );
- c.add( "AdministrativePointInterceptor" );
- c.add( "DefaultAuthorizationInterceptor" );
- c.add( "ExceptionInterceptor" );
- c.add( "OperationalAttributeInterceptor" );
- c.add( "SchemaInterceptor" );
- c.add( "CollectiveAttributeInterceptor" );
- c.add( "SubentryInterceptor" );
- c.add( "EventInterceptor" );
- c.add( "TriggerInterceptor" );
- BYPASS_INTERCEPTORS = Collections.unmodifiableCollection( c );
- }
-
-
- /**
* Creates an authentication service interceptor.
*/
public AuthenticationInterceptor()
|