[256936] Support for Offline Mode

https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
index 1ddc87eaa7..b9d91c255a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.java
@@ -83,18 +83,18 @@ public abstract class AbstractObjectConflictResolver implements CDOConflictResol
 
   public void resolveConflicts(Set<CDOObject> conflicts)
   {
-    Map<CDOID, CDORevisionDelta> revisionDeltas = transaction.getRevisionDeltas();
+    Map<CDOID, CDORevisionDelta> localDeltas = transaction.getRevisionDeltas();
     for (CDOObject conflict : conflicts)
     {
-      CDORevisionDelta revisionDelta = revisionDeltas.get(conflict.cdoID());
-      resolveConflict(conflict, revisionDelta);
+      CDORevisionDelta localDelta = localDeltas.get(conflict.cdoID());
+      resolveConflict(conflict, localDelta);
     }
   }
 
   /**
    * Resolves the conflict of a single object in the current transaction.
    */
-  protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta revisionDelta);
+  protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta);
 
   protected void hookTransaction(CDOTransaction transaction)
   {