directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r584639 - in /directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service: ClientConnectionManager.java protocol/handler/ReplicationClientContextHandler.java
Date Sun, 14 Oct 2007 23:44:02 GMT
Author: akarasulu
Date: Sun Oct 14 16:44:01 2007
New Revision: 584639

URL: http://svn.apache.org/viewvc?rev=584639&view=rev
Log:
fix for mitosis problem which was due to a change in mina which returns -1 for the session.getScheduledWriteRquests()
method which before returned 0 - modified the check for anything equal to zero or less

Modified:
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
    directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java

Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java?rev=584639&r1=584638&r2=584639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
(original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
Sun Oct 14 16:44:01 2007
@@ -386,8 +386,8 @@
             }
             catch ( RuntimeIOException e )
             {
-                LOG.error( "[Replica-{}] Failed to connect to replica-" + replica.getId(),
-                        ClientConnectionManager.this.configuration.getReplicaId(), e );
+                LOG.error( "[Replica-" + ClientConnectionManager.this.configuration.getReplicaId()
+                        + "] Failed to connect to replica-" + replica.getId(), e );
             }
             finally
             {

Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java?rev=584639&r1=584638&r2=584639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
(original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationClientContextHandler.java
Sun Oct 14 16:44:01 2007
@@ -244,8 +244,8 @@
         // (LogEntryMessages) is received, and no write request is pending,
         // it means previous replication process ended or this is the
         // first replication attempt.
-        if ( ctx.getState() == State.READY && ctx.getScheduledExpirations() == 0
-            && ctx.getSession().getScheduledWriteRequests() == 0 )
+        if ( ctx.getState() == State.READY && ctx.getScheduledExpirations() <=
0
+            && ctx.getSession().getScheduledWriteRequests() <= 0 )
         {
         	// Initiate replication process asking update vector.
             if ( SessionLog.isDebugEnabled( ctx.getSession() ) ) {



Mime
View raw message