Attachment 205900 Details for Bug 352977 – Workaround that needs method visibility change

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Workaround that needs method visibility change

bug352977_workaround.patch (text/plain), 1.57 KB, created by Steve Monnier

on 2011-10-25 06:05:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Monnier

Created: 2011-10-25 06:05:28 EDT

Size: 1.57 KB

patch

obsolete

>Index: src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java
>===================================================================
>--- src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java	(revision 9490)
>+++ src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java	(working copy)
>@@ -103,6 +103,11 @@
>    * @since 4.0
>    */
>   public Map<InternalCDOObject, InternalCDORevision> getCleanRevisions();
>+  
>+  /**
>+   * @since 4.0.1
>+   */
>+  public void collapseSavepoints(CDOCommitContext commitContext);
> 
>   /**
>    * Provides a context for a commit operation.
>Index: src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
>===================================================================
>--- src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java	(revision 9490)
>+++ src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java	(working copy)
>@@ -1738,7 +1738,7 @@
>     committables = null;
>   }
> 
>-  private void collapseSavepoints(CDOCommitContext commitContext)
>+  public void collapseSavepoints(CDOCommitContext commitContext)
>   {
>     InternalCDOSavepoint newSavepoint = createSavepoint(null);
>     copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());
>@@ -2615,9 +2615,9 @@
>       {
>         for (CDOObject object : objects.values())
>         {
>-          CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result);
>+                CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result);
>+            }
>         }
>-      }
>     }
> 
>     public boolean isPartialCommit()

Actions: View | Diff

Attachments on bug 352977: 200450 | 200494 | 205900