Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-05-05 07:11:28 -0400
committerEike Stepper2009-05-05 07:11:28 -0400
commit7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a (patch)
treeaee16ed86104a07418d119986af70d9f3d0d7976 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction
parentedb6eda1c3041c7dd945b3a550d34108a26f2f62 (diff)
downloadcdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.tar.gz
cdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.tar.xz
cdo-7f19a7492f6f8d6878512a2f9a0cc3fbfe97d90a.zip
formatting
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java23
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java5
2 files changed, 15 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
index c4822d7068..3460edf310 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSavepointImpl.java
@@ -1,14 +1,14 @@
-/**
- * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Simon McDuff - initial API and implementation
- * Eike Stepper - maintenance
- * Simon McDuff - http://bugs.eclipse.org/204890
+/**
+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Simon McDuff - initial API and implementation
+ * Eike Stepper - maintenance
+ * Simon McDuff - http://bugs.eclipse.org/204890
*/
package org.eclipse.emf.internal.cdo.transaction;
@@ -280,7 +280,6 @@ public class CDOSavepointImpl extends AbstractSavepoint
}
else
{
-
for (CDOFeatureDelta delta : entry.getValue().getFeatureDeltas())
{
revisionDelta.addFeatureDelta(((InternalCDOFeatureDelta)delta).copy());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index e27c4189ca..8d4a2cf4af 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Simon McDuff - initial API and implementation
* Eike Stepper - maintenance
@@ -528,6 +528,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
CommitTransactionResult result = sessionProtocol.commitTransactionPhase3(xaContext, monitor);
check_result(result);
}
+
xaContext.postCommit(xaContext.getResult());
xaContext.setState(null);
}
@@ -587,6 +588,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
{
CDOXATransactionImpl.this.add((InternalCDOTransaction)notification.getNewValue());
}
+
break;
case Notification.REMOVE:
@@ -594,6 +596,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
{
CDOXATransactionImpl.this.remove((InternalCDOTransaction)notification.getNewValue());
}
+
break;
}
}

Back to the top