Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-08-16 06:11:42 -0400
committerDani Megert2013-08-16 06:11:42 -0400
commite3f1015cbf3a5312084ad2aa4ded2deebfb69269 (patch)
tree9731f79ca897e54b8fb8a8fd9d3370bcb13b3dbf
parent249bf6977eb7e43384eadf48df52f60ac68f3c24 (diff)
downloadeclipse.platform.team-e3f1015cbf3a5312084ad2aa4ded2deebfb69269.tar.gz
eclipse.platform.team-e3f1015cbf3a5312084ad2aa4ded2deebfb69269.tar.xz
eclipse.platform.team-e3f1015cbf3a5312084ad2aa4ded2deebfb69269.zip
Fixed bug 278813: NPE in Worker.add
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java
index 3538eff11..d68b7f760 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Worker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2013 IBM Corporation 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
@@ -111,8 +111,8 @@ public class Worker implements IRunnableWithProgress {
if (work.isEmpty())
return;
currentTask = work.remove();
+ currentMonitor= subMonitorFor(pm, 10);
}
- currentMonitor = subMonitorFor(pm, 10);
currentTask.run(currentMonitor);
}

Back to the top