You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/11/05 02:24:11 UTC
svn commit: r471313 - in
/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis:
common/Constants.java
service/protocol/handler/ReplicationClientContextHandler.java
Author: akarasulu
Date: Sat Nov 4 17:24:11 2006
New Revision: 471313
URL: http://svn.apache.org/viewvc?view=rev&rev=471313
Log:
fixed normalization bug and added constant for OID of objectClass
Modified:
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java
directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java?view=diff&rev=471313&r1=471312&r2=471313
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java (original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/common/Constants.java Sat Nov 4 17:24:11 2006
@@ -56,6 +56,8 @@
return true;
}
};
+
+ public static final String OBJECT_CLASS_OID = "2.5.4.0";
private Constants()
{
Modified: directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?view=diff&rev=471313&r1=471312&r2=471313
==============================================================================
--- directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java (original)
+++ directory/trunks/apacheds/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java Sat Nov 4 17:24:11 2006
@@ -69,8 +69,7 @@
public void contextBegin( ReplicationContext ctx ) throws Exception
{
// Send a login message.
- LoginMessage m = new LoginMessage(
- ctx.getNextSequence(),
+ LoginMessage m = new LoginMessage( ctx.getNextSequence(),
ctx.getService().getConfiguration().getReplicaId() );
ctx.getSession().write( m );
@@ -158,8 +157,7 @@
{
if( message.getResponseCode() != Constants.OK )
{
- SessionLog.warn(
- ctx.getSession(),
+ SessionLog.warn( ctx.getSession(),
"Login attempt failed: " + message.getResponseCode() );
ctx.getSession().close();
return;
@@ -310,7 +308,7 @@
NamingEnumeration e = ctx.getServiceConfiguration().getPartitionNexus().search(
contextName,
ctx.getServiceConfiguration().getEnvironment(),
- new PresenceNode( "objectClass" ), ctrl );
+ new PresenceNode( org.apache.directory.mitosis.common.Constants.OBJECT_CLASS_OID ), ctrl );
try
{
@@ -334,8 +332,7 @@
}
catch( IllegalArgumentException ex )
{
- SessionLog.warn(
- ctx.getSession(),
+ SessionLog.warn( ctx.getSession(),
"An entry with improper entryCSN: " + sr.getName() );
continue;
}