Attachment #205900 for bug #352977

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

Lines 103-108 Link Here

(-)src/org/eclipse/emf/spi/cdo/InternalCDOTransaction.java (+5 lines)
103	* @since 4.0	103	* @since 4.0
104	*/	104	*/
105	public Map<InternalCDOObject, InternalCDORevision> getCleanRevisions();	105	public Map<InternalCDOObject, InternalCDORevision> getCleanRevisions();
		106
		107	/**
		108	* @since 4.0.1
		109	*/
		110	public void collapseSavepoints(CDOCommitContext commitContext);
106		111
107	/**	112	/**
108	* Provides a context for a commit operation.	113	* Provides a context for a commit operation.




    committables = null;
  }

  public void collapseSavepoints(CDOCommitContext commitContext)
  {
    InternalCDOSavepoint newSavepoint = createSavepoint(null);
    copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());

      {
        for (CDOObject object : objects.values())
        {
                CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result);
            }
        }
      }
    }

    public boolean isPartialCommit()

Return to bug 352977

Lines 1738-1744 Link Here

(-)src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java (-3 / +3 lines)
1738	committables = null;	1738	committables = null;
1739	}	1739	}
1740		1740
1741	private void collapseSavepoints(CDOCommitContext commitContext)	1741	public void collapseSavepoints(CDOCommitContext commitContext)
1742	{	1742	{
1743	InternalCDOSavepoint newSavepoint = createSavepoint(null);	1743	InternalCDOSavepoint newSavepoint = createSavepoint(null);
1744	copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());	1744	copyUncommitted(lastSavepoint.getAllNewObjects(), commitContext.getNewObjects(), newSavepoint.getNewObjects());
Lines 2615-2623 Link Here
2615	{	2615	{
2616	for (CDOObject object : objects.values())	2616	for (CDOObject object : objects.values())
2617	{	2617	{
2618	CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result);	2618	CDOStateMachine.INSTANCE.commit((InternalCDOObject)object, result);
		2619	}
2619	}	2620	}
2620	}
2621	}	2621	}
2622		2622
2623	public boolean isPartialCommit()	2623	public boolean isPartialCommit()