diff options
author | Andrey Loskutov | 2017-05-05 13:52:46 +0000 |
---|---|---|
committer | Andrey Loskutov | 2017-05-05 13:53:58 +0000 |
commit | 8eba2421be077d94ba9f58581e2eb5890c949033 (patch) | |
tree | 6fb05b24412a87f365f71f84bd43b5b2ef9fc426 | |
parent | f7105dffc4cec6de6927ffc5a6985f1b79dc2752 (diff) | |
download | eclipse.platform.team-I20170509-1100.tar.gz eclipse.platform.team-I20170509-1100.tar.xz eclipse.platform.team-I20170509-1100.zip |
Bug 450530 - [team] NPE in ResourceModelContentProvider.getTraversalsY20170512-0230Y20170511-1500Y20170511-1000S4_7_0_M7I20170515-0800I20170514-2000I20170514-1120I20170512-0500I20170511-1200I20170510-2000I20170510-0800I20170509-2000I20170509-1300I20170509-1100I20170509-0945I20170509-0800I20170508-2000I20170508-0800I20170507-2000I20170506-2000I20170505-2000
ISynchronizationScope.getTraversals(ResourceMapping) can return null, so
code using it should check for null.
Change-Id: I79bd627c87917f2700e98f1c23dadf47d1128e33
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-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)); + } } } } |