diff options
| author | Tomasz Zarna | 2011-12-02 16:34:09 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2011-12-02 16:34:09 +0000 |
| commit | 888c23e142538e6d5c56b0c75f47aa39abd26956 (patch) | |
| tree | 6393befa1525098d792a15be72bdf7d3aef25483 | |
| parent | f182345276219ff7d9bb48444d33d8c4ad250afa (diff) | |
| download | eclipse.platform.team-888c23e142538e6d5c56b0c75f47aa39abd26956.tar.gz eclipse.platform.team-888c23e142538e6d5c56b0c75f47aa39abd26956.tar.xz eclipse.platform.team-888c23e142538e6d5c56b0c75f47aa39abd26956.zip | |
bug 365073: Patcher#applyAll doesn't expect null progress monitorv20111202-1634
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java index 0699d116c..baecbe190 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/WorkspacePatcher.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2011 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 @@ -32,6 +32,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; @@ -74,6 +75,8 @@ public class WorkspacePatcher extends Patcher { //---- parsing patch files public void applyAll(IProgressMonitor pm, IFileValidator validator) throws CoreException { + if (pm == null) + pm = new NullProgressMonitor(); if (!fIsWorkspacePatch) { super.applyAll(pm, validator); } else { |