diff options
| author | Robin Stocker | 2014-11-22 14:54:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2014-11-22 14:54:39 +0000 |
| commit | 68db82959fb599871dfba316fd70c11e6678fbcd (patch) | |
| tree | 5e69e13a119a7f67d95010a504ab23c37eb52952 | |
| parent | e0f0134e8996aec808855a4e877cdace33f27153 (diff) | |
| parent | c78acb491aaef7af161365202471e764fb3b7ded (diff) | |
| download | egit-68db82959fb599871dfba316fd70c11e6678fbcd.tar.gz egit-68db82959fb599871dfba316fd70c11e6678fbcd.tar.xz egit-68db82959fb599871dfba316fd70c11e6678fbcd.zip | |
Merge "Fix NPE in GitResourceVariantTreeSubscriber.roots()"
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java index 914e42db0a..5b76b0ecf9 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java @@ -206,6 +206,8 @@ public class GitResourceVariantTreeSubscriber extends public IResource[] roots() { if (roots == null) roots = gsds.getAllProjects(); + if (roots == null) + return new IResource[0]; IResource[] result = new IResource[roots.length]; System.arraycopy(roots, 0, result, 0, roots.length); return result; |