directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kiran Ayyagari <kayyag...@apache.org>
Subject Re: svn commit: r1486738 - /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
Date Thu, 30 May 2013 15:17:22 GMT
On Thu, May 30, 2013 at 5:49 AM, Emmanuel Lécharny <elecharny@gmail.com>wrote:

> I'm afraid this commit breaks the build...
>
> my bad, my test-run didn't catch this and on a second thought this is not
required, I have reverted the offending code
in the commit 1487891

> This is what I now get when I run the
> ClientServerReplicationI.testModify() test :
>
> -----------> Dumping the server <-----------
> -----------> Looking for
>
> 2.5.4.3=user14,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com
> <-----------
> Entry
>
> 2.5.4.3=user1renamedmovedandrenamed,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com
> exists, entrtyUuid = entryUUID: 9a381ea9-85e5-4d1c-990a-4daa437eda68
>
> Entry
>
> 2.5.4.3=user12,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com
> exists, entrtyUuid = entryUUID: 1f61ad18-09b6-4518-b833-4365c2faf50a
>
> Entry 0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com
> exists, entrtyUuid = entryUUID: 868c28b8-5e07-4503-99a7-4d7bbf0b8628
>
> The searched entry exists !!!
> found Entry
>
> 2.5.4.3=user14,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com
> exists, entrtyUuid = entryUUID: c351bd92-0397-4fa9-afef-b62ac95430d3
>
> -----------> Dump done <-----------
>
> If I revert it, the test is passing...
>
> I wonder if the fact that we don't sae the cookie is the cause of this
> failure ?
>
>
> Le 5/28/13 7:07 AM, kayyagari@apache.org a écrit :
> > Author: kayyagari
> > Date: Tue May 28 05:07:39 2013
> > New Revision: 1486738
> > I
> > URL: http://svn.apache.org/r1486738
> > Log:
> > o replicate createTimestamp and creatorsName attributes
> > o cleaned up connectionClosed()
> >
> > Modified:
> >
> directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
> >
> > Modified:
> directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
> > URL:
> http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java?rev=1486738&r1=1486737&r2=1486738&view=diff
> >
> ==============================================================================
> > ---
> directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
> (original)
> > +++
> directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
> Tue May 28 05:07:39 2013
> > @@ -126,7 +126,7 @@ public class ReplicationConsumerImpl imp
> >      private SchemaManager schemaManager;
> >
> >      /** flag to indicate whether the consumer was disconnected */
> > -    private boolean disconnected;
> > +    private volatile boolean disconnected;
> >
> >      /** the core session */
> >      private CoreSession session;
> > @@ -136,8 +136,6 @@ public class ReplicationConsumerImpl imp
> >          {
> >              SchemaConstants.ENTRY_UUID_AT,
> >              SchemaConstants.ENTRY_DN_AT,
> > -            SchemaConstants.CREATE_TIMESTAMP_AT,
> > -            SchemaConstants.CREATORS_NAME_AT,
> >              SchemaConstants.ENTRY_PARENT_ID_AT,
> >              SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT
> >      };
> > @@ -539,17 +537,7 @@ public class ReplicationConsumerImpl imp
> >                  config.getProducer() );
> >          }
> >
> > -        // Cleanup
> > -        disconnected = true;
> > -        connection = null;
> > -
> > -        // persist the cookie
> > -        storeCookie();
> > -
> > -        // reset the cookie
> > -        syncCookie = null;
> > -
> > -        return;
> > +        disconnect();
> >      }
> >
> >
> >
> >
>
>
> --
> Regards,
> Cordialement,
> Emmanuel Lécharny
> www.iktek.com
>
>


-- 
Kiran Ayyagari
http://keydap.com

Mime
View raw message