Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDariusz Luksza2011-05-29 11:31:27 +0000
committerCode Review2011-05-29 11:31:27 +0000
commitb43ed163e679812f797f06227213d1a24f4eddf0 (patch)
tree594ef513e996710bbcf3787a05774a31165253e1
parent20602ca197f7c0be1f70a62f89400bf6825ba08c (diff)
parent277250db32f6721d45d204e5b81ed65ce74eddb1 (diff)
downloadegit-b43ed163e679812f797f06227213d1a24f4eddf0.tar.gz
egit-b43ed163e679812f797f06227213d1a24f4eddf0.tar.xz
egit-b43ed163e679812f797f06227213d1a24f4eddf0.zip
Merge "Fix NPE in CommitGraphTable" into stable-1.0
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
index a789add46..ec8fadc7c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
@@ -379,6 +379,8 @@ class CommitGraphTable {
r.append(d.getId().name());
}
+ if (clipboard == null || clipboard.isDisposed())
+ return;
clipboard.setContents(new Object[] { r.toString() },
new Transfer[] { TextTransfer.getInstance() }, DND.CLIPBOARD);
}
@@ -414,7 +416,8 @@ class CommitGraphTable {
// the commit list is thread safe
synchronized (allCommits) {
for (PlotCommit commit : allCommits)
- commitsMap.put(commit.getId().name(), commit);
+ if (commit != null)
+ commitsMap.put(commit.getId().name(), commit);
}
}

Back to the top