svn commit: r560042 - /directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java

[ma...@apache.org]

Author: malderson
Date: Thu Jul 26 17:46:09 2007
New Revision: 560042

URL: http://svn.apache.org/viewvc?view=rev&rev=560042
Log:
Fixed DIRSERVER-895, where a server will never accept replication logs until it is restarted if a connection is closed during a replication transaction (e.g. due to a message timeout).  No test for this yet as other issues would prevent it from being reliable.

Modified:
    directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java

Modified: directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java?view=diff&rev=560042&r1=560041&r2=560042
==============================================================================
--- directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java (original)
+++ directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationServerContextHandler.java Thu Jul 26 17:46:09 2007
@@ -69,7 +69,7 @@
     public synchronized void contextEnd( ReplicationContext ctx ) throws Exception
     {
         // Reset the mark if the context has the unfinished transaction.
-        if ( !ctx.getPeer().equals( replicaInTransaction ) )
+        if ( ctx.getPeer() != null && ctx.getPeer().equals( replicaInTransaction ) )
         {
             replicaInTransaction = null;
         }