diff options
| author | Laurent Goubet | 2013-04-18 08:05:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-04-18 12:20:55 +0000 |
| commit | cc34f6558e6c90b67c88444a9c3ff39b94190ec3 (patch) | |
| tree | d31a1c074dab40ae5a83c7ca7531f12bd3051e25 | |
| parent | 7aac348c7ad4ff06c09d1892a4867f0f6059496f (diff) | |
| download | egit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.tar.gz egit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.tar.xz egit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.zip | |
NPE when synchronizing with resources out of the workspace
Bug: 405772
Change-Id: I0b6fede76e74753f4bb19c2308ac6e6df0618077
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java | 2 |
1 files changed, 1 insertions, 1 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 4f57e52022..1fce3c6d11 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 @@ -241,7 +241,7 @@ public class GitResourceVariantTreeSubscriber extends @Override public IDiff getDiff(IResource resource) throws CoreException { final GitSynchronizeData syncData = gsds.getData(resource.getProject()); - if (syncData.shouldIncludeLocal()) + if (syncData == null || syncData.shouldIncludeLocal()) return super.getDiff(resource); SyncInfo info = getSyncInfo(resource); |