Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2018-05-09 05:50:13 -0400
committerAlexander Kurtakov2018-05-12 04:31:43 -0400
commit10de381e3c8b0656c0a5114a6332811f5f5484b4 (patch)
tree8b388889548d31aa43f67358fbc714aa6f3f55f5
parent89e4950f804b53b7c87edac36608c8d1a252c0e1 (diff)
downloadeclipse.platform.team-10de381e3c8b0656c0a5114a6332811f5f5484b4.tar.gz
eclipse.platform.team-10de381e3c8b0656c0a5114a6332811f5f5484b4.tar.xz
eclipse.platform.team-10de381e3c8b0656c0a5114a6332811f5f5484b4.zip
Fixes a regression. beginTask must not be called twice on an IProgressMonitor instance. SubMonitor.convert() will call beginTask on the given monitor, so beginTask must not be called before on this monitor instance. To avoid this, a SubMonitor is created with subMonitorFor given the required number of ticks. Change-Id: Icb87740d2a98a0c7b73bfaf6879c767e937759bf Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
index 13fa3e4a0..0fc27b09f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Session.java
@@ -151,8 +151,7 @@ public class Session {
public void open(IProgressMonitor monitor, boolean writeAccess) throws CVSException {
if (connection != null) throw new IllegalStateException();
- monitor = Policy.monitorFor(monitor);
- monitor.beginTask(null, 100);
+ monitor = Policy.subMonitorFor(monitor, 100);
boolean opened = false;
try {

Back to the top