diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java index bbf291f3e..83e029d50 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelContentProvider.java @@ -166,6 +166,9 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider if (scope.contains(resource)) { List<ResourceTraversal> result = new ArrayList<>(); ResourceTraversal[] traversals = scope.getTraversals(); + if(traversals == null) { + return result.toArray(new ResourceTraversal[result.size()]); + } for (int i = 0; i < traversals.length; i++) { ResourceTraversal traversal = traversals[i]; if (traversal.contains(resource)) { @@ -209,7 +212,9 @@ public class ResourceModelContentProvider extends SynchronizationContentProvider mapping = scope.getMapping(element); if (mapping != null) { ResourceTraversal[] traversals = scope.getTraversals(mapping); - result.addAll(Arrays.asList(traversals)); + if(traversals != null) { + result.addAll(Arrays.asList(traversals)); + } } } } |