Fix for an issue where the order of operations guaranteed an Assertio…

…nError if assertions were enabled. Flipped the order instead (cherry picked from commit 7266a74)
systay · Jan 25, 2012 · c35ce51 · c35ce51
1 parent 14fd17e
commit c35ce51
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java b/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
@@ -1290,7 +1290,6 @@ public synchronized void applyTransaction( ReadableByteChannel byteChannel )
         {
             if ( !successfullyApplied && logApplier.getStartEntry() != null )
             {   // Unmap this identifier if tx not applied correctly
-                xidIdentMap.remove( xidIdent );
                 try
                 {
                     xaRm.forget( logApplier.getStartEntry().getXid() );
@@ -1299,6 +1298,10 @@ public synchronized void applyTransaction( ReadableByteChannel byteChannel )
                 {
                     throw new IOException( e );
                 }
+                finally
+                {
+                    xidIdentMap.remove( xidIdent );
+                }
             }
         }
         byteChannel.close();