diff options
| author | Laurent Goubet | 2013-07-30 09:52:48 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2013-08-22 22:06:59 +0000 |
| commit | b8e2c5fe7ec03c2db625e530d55a1bfd8a0928b0 (patch) | |
| tree | 12107c15b8dd74e69f843dbf978fc5b1fb26f9f3 | |
| parent | cfbf8f57c6e18c006df6b3fd7ab2a0a4aa409cb3 (diff) | |
| download | egit-b8e2c5fe7ec03c2db625e530d55a1bfd8a0928b0.tar.gz egit-b8e2c5fe7ec03c2db625e530d55a1bfd8a0928b0.tar.xz egit-b8e2c5fe7ec03c2db625e530d55a1bfd8a0928b0.zip | |
Fix potential NPE from passing null as progress monitor
Even though the javadoc advertizes it, a few model providers will not
accept "null" as a progress monitor. Use the NullProgressMonitor
instead to be on the safe side.
Change-Id: Ie4aa950b970297185b0488adadfc791d429eb364
Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
Signed-off-by: Robin Stocker <robin@nibor.org>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java index fc0e426968..0d362ee317 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java @@ -31,6 +31,7 @@ import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.resources.mapping.ResourceMappingContext; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.project.RepositoryMapping; @@ -213,7 +214,7 @@ public class ResourceUtil { // get mappings from model provider if there are matching resources final ModelProvider model = candidate.getModelProvider(); final ResourceMapping[] modelMappings = model.getMappings( - file, context, null); + file, context, new NullProgressMonitor()); for (ResourceMapping mapping : modelMappings) mappings.add(mapping); } |