diff options
| author | Eike Stepper | 2015-05-20 10:20:05 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-05-20 10:33:56 +0000 |
| commit | 26f3832ce0f83af27ebfc763d24b526c02b207e6 (patch) | |
| tree | d81806e5c849224e7248dd12b23adf63a6126136 /plugins/org.eclipse.emf.cdo.dawn.util | |
| parent | e5a4f78c481f623858f6cb4ca9d6c3890ab7025a (diff) | |
| download | cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.gz cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.tar.xz cdo-26f3832ce0f83af27ebfc763d24b526c02b207e6.zip | |
[467442] Add Interactive Transaction Conflict Resolution
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.util')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java index b64529f700..94489567a3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.util/src/org/eclipse/emf/cdo/dawn/util/connection/CDOConnectionUtil.java @@ -182,6 +182,7 @@ public class CDOConnectionUtil session.close(); } + @SuppressWarnings("deprecation") public CDOTransaction getOrOpenCurrentTransaction(String id, ResourceSet resourceSet, String repositoryName) { CDOTransaction transaction = getCurrentTransaction(id); |