Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-12-26 02:31:56 -0500
committerEike Stepper2009-12-26 02:31:56 -0500
commit9a4c94b26f95e2ebf6560ef2c5b772752adf157f (patch)
treed2b8061a2fdd5677d4f4fdb240a942d9cd5a9390 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction
parent70e3ba0f16ce541c0e537882224c003bc6636271 (diff)
downloadcdo-9a4c94b26f95e2ebf6560ef2c5b772752adf157f.tar.gz
cdo-9a4c94b26f95e2ebf6560ef2c5b772752adf157f.tar.xz
cdo-9a4c94b26f95e2ebf6560ef2c5b772752adf157f.zip
[290251] CDOXATransaction commit does not end.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=290251
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/CDOXATransactionImpl.java30
1 files changed, 15 insertions, 15 deletions
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 e8913f0a33..02bfc73bb0 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
@@ -103,9 +103,9 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
private ExecutorService executorService = createExecutorService();
- private Map<InternalCDOTransaction, InternalCDOXACommitContext> activeContext = new HashMap<InternalCDOTransaction, InternalCDOXACommitContext>();
+ private Map<InternalCDOTransaction, InternalCDOXACommitContext> activeContexts = new HashMap<InternalCDOTransaction, InternalCDOXACommitContext>();
- private Map<InternalCDOTransaction, Set<CDOID>> requestedCDOID = new HashMap<InternalCDOTransaction, Set<CDOID>>();
+ private Map<InternalCDOTransaction, Set<CDOID>> requestedCDOIDs = new HashMap<InternalCDOTransaction, Set<CDOID>>();
private InternalCDOXASavepoint lastSavepoint = createSavepoint(null);
@@ -124,9 +124,9 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
return allowRequestFromTransactionEnabled;
}
- public void setAllowRequestFromTransactionEnabled(boolean allRequest)
+ public void setAllowRequestFromTransactionEnabled(boolean on)
{
- allowRequestFromTransactionEnabled = allRequest;
+ allowRequestFromTransactionEnabled = on;
}
public void add(InternalCDOTransaction transaction)
@@ -173,13 +173,13 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
public void add(InternalCDOTransaction transaction, CDOID object)
{
- synchronized (requestedCDOID)
+ synchronized (requestedCDOIDs)
{
- Set<CDOID> ids = requestedCDOID.get(transaction);
+ Set<CDOID> ids = requestedCDOIDs.get(transaction);
if (ids == null)
{
ids = new HashSet<CDOID>();
- requestedCDOID.put(transaction, ids);
+ requestedCDOIDs.put(transaction, ids);
}
ids.add(object);
@@ -188,13 +188,13 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
public CDOID[] get(InternalCDOTransaction transaction)
{
- Set<CDOID> ids = requestedCDOID.get(transaction);
+ Set<CDOID> ids = requestedCDOIDs.get(transaction);
return ids.toArray(new CDOID[ids.size()]);
}
public InternalCDOXACommitContext getCommitContext(CDOTransaction transaction)
{
- return activeContext.get(transaction);
+ return activeContexts.get(transaction);
}
private void send(Collection<InternalCDOXACommitContext> xaContexts, final IProgressMonitor progressMonitor)
@@ -257,8 +257,8 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
private void cleanUp()
{
- activeContext.clear();
- requestedCDOID.clear();
+ activeContexts.clear();
+ requestedCDOIDs.clear();
}
private List<InternalCDOTransaction> getTransactions(CDOViewSet viewSet)
@@ -291,7 +291,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
InternalCDOCommitContext context = transaction.createCommitContext();
InternalCDOXACommitContext xaContext = createXACommitContext(context);
xaContext.setState(CDOXAPhase1State.INSTANCE);
- activeContext.put(transaction, xaContext);
+ activeContexts.put(transaction, xaContext);
}
try
@@ -299,7 +299,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
// We need to complete 3 phases
while (phase < 3)
{
- send(activeContext.values(), new SubProgressMonitor(progressMonitor, 1));
+ send(activeContexts.values(), new SubProgressMonitor(progressMonitor, 1));
++phase;
}
}
@@ -308,14 +308,14 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
if (phase < 2)
{
// Phase 0 and 1 are the only two phases we can cancel.
- for (InternalCDOXACommitContext xaContext : activeContext.values())
+ for (InternalCDOXACommitContext xaContext : activeContexts.values())
{
xaContext.setState(CDOXACancel.INSTANCE);
}
try
{
- send(activeContext.values(), new SubProgressMonitor(progressMonitor, 2 - phase));
+ send(activeContexts.values(), new SubProgressMonitor(progressMonitor, 2 - phase));
}
catch (InterruptedException ex1)
{

Back to the top