motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix possible NPE in Repository.resolve 

Change-Id: I9b19cd90b338a4c3cae5661c658526b7e98c95d1
Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>‌
This commit is contained in:
Marc Strapetz 2014-01-16 16:55:50 +01:00
parent 8e0e78858c
commit ea16c2afff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
View File

@ -384,7 +384,8 @@ public ObjectId resolve(final String revstr)
try {
Object resolved = resolve(rw, revstr);
if (resolved instanceof String) {
return getRef((String) resolved).getLeaf().getObjectId();
final Ref ref = getRef((String)resolved);
return ref != null ? ref.getLeaf().getObjectId() : null;
} else {
return (ObjectId) resolved;
}