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 2006/04/04 06:16:35 UTC
svn commit: r391221 - in
/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap:
LdapProtocolProvider.java support/SearchHandler.java
Author: elecharny
Date: Mon Apr 3 21:16:31 2006
New Revision: 391221
URL: http://svn.apache.org/viewcvs?rev=391221&view=rev
Log:
Reverted a bad fix
Modified:
directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java
directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
Modified: directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java
URL: http://svn.apache.org/viewcvs/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java?rev=391221&r1=391220&r2=391221&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java (original)
+++ directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolProvider.java Mon Apr 3 21:16:31 2006
@@ -340,10 +340,6 @@
private static final class ProtocolCodecFactoryImpl implements ProtocolCodecFactory
{
final Hashtable env;
-
- // Define two static members to avoid useless object constructions
- static Asn1CodecEncoder encoder;
- static Asn1CodecDecoder decoder;
public ProtocolCodecFactoryImpl()
@@ -358,25 +354,15 @@
}
- public synchronized ProtocolEncoder getEncoder()
+ public ProtocolEncoder getEncoder()
{
- if ( encoder == null )
- {
- encoder = new Asn1CodecEncoder( new MessageEncoder( env ) );
- }
-
- return encoder;
+ return new Asn1CodecEncoder( new MessageEncoder( env ) );
}
- public synchronized ProtocolDecoder getDecoder()
+ public ProtocolDecoder getDecoder()
{
- if ( decoder == null )
- {
- decoder = new Asn1CodecDecoder( new MessageDecoder( env ) );
- }
-
- return decoder;
+ return new Asn1CodecDecoder( new MessageDecoder( env ) );
}
}
Modified: directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewcvs/directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?rev=391221&r1=391220&r2=391221&view=diff
==============================================================================
--- directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java (original)
+++ directory/branches/apacheds/1.0/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java Mon Apr 3 21:16:31 2006
@@ -112,7 +112,12 @@
*/
public void messageReceived( IoSession session, Object request )
{
- ServerLdapContext ctx;
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "Message received : " + request.toString() );
+ }
+
+ ServerLdapContext ctx;
SearchRequest req = ( SearchRequest ) request;
NamingEnumeration list = null;
String[] ids = null;