diff options
| author | Matthias Sohn | 2015-01-21 21:45:09 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2015-01-21 21:45:09 +0000 |
| commit | 77c6786c27c1e5472f06d4e3511cd73a6d6b2081 (patch) | |
| tree | 9b8aeda28c4a33ca20ab5cc7fb1d2cba1a42f4c6 | |
| parent | 852ba3dc21bff52a4fcd98915c1a1b8e4b8ed7bb (diff) | |
| parent | 29eef35a996d12f450450af025e4c0323784a249 (diff) | |
| download | egit-77c6786c27c1e5472f06d4e3511cd73a6d6b2081.tar.gz egit-77c6786c27c1e5472f06d4e3511cd73a6d6b2081.tar.xz egit-77c6786c27c1e5472f06d4e3511cd73a6d6b2081.zip | |
Merge remote-tracking branch 'origin/stable-3.6'
* origin/stable-3.6:
Prepare 3.6.3-SNAPSHOT builds
EGit v3.6.2.201501210735-r
Fix NPE hit when restoring commit editor from task context
Change-Id: I4299568420ad662da11d7e93527b434fbdf03260
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java index 79ad8f8bb7..4412c5f582 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorInputFactory.java @@ -104,7 +104,9 @@ public class CommitEditorInputFactory implements IElementFactory { walk.parseBody(parent); RepositoryCommit repositoryCommit = new RepositoryCommit( repository, commit); - repositoryCommit.setStash(memento.getBoolean(STASH).booleanValue()); + Boolean isStash = memento.getBoolean(STASH); + if (isStash != null) + repositoryCommit.setStash(isStash.booleanValue()); return repositoryCommit; } catch (IOException e) { return null; |