Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-11-11 01:39:14 -0500
committerEike Stepper2009-11-11 01:39:14 -0500
commit3c482c3ee91c6499e6e5b43deae3bd75ca113817 (patch)
treef77572bf5327df2c5257cdc0bdb483b916dad2d8 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction
parentddf2fe8740c161bec5d0eb6ad0eb064a33374bc6 (diff)
downloadcdo-3c482c3ee91c6499e6e5b43deae3bd75ca113817.tar.gz
cdo-3c482c3ee91c6499e6e5b43deae3bd75ca113817.tar.xz
cdo-3c482c3ee91c6499e6e5b43deae3bd75ca113817.zip
[294838] TimeoutException on session refresh
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294838
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.java9
1 files changed, 7 insertions, 2 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 d17293601d..73e4d4b6c4 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
@@ -19,9 +19,11 @@ import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.cdo.view.CDOViewSet;
+import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.emf.internal.cdo.messages.Messages;
import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.WrappedException;
import org.eclipse.net4j.util.om.monitor.EclipseMonitor;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
import org.eclipse.net4j.util.om.monitor.EclipseMonitor.SynchonizedSubProgressMonitor;
@@ -216,6 +218,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
}
catch (TimeoutException ex)
{
+ OM.LOG.warn(ex);
}
}
} while (xaContexts.size() != nbProcessDone);
@@ -292,11 +295,13 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
{
send(activeContext.values(), new SubProgressMonitor(progressMonitor, 2 - phase));
}
- catch (InterruptedException ignore)
+ catch (InterruptedException ex1)
{
+ throw WrappedException.wrap(ex1);
}
- catch (ExecutionException ignore)
+ catch (ExecutionException ex1)
{
+ OM.LOG.warn(ex1);
}
}

Back to the top