Explorar el Código

Fix possible NPE in Repository.resolve

Change-Id: I9b19cd90b338a4c3cae5661c658526b7e98c95d1
Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>‌
tags/v3.4.0.201405051725-m7
Marc Strapetz hace 10 años
padre
commit
ea16c2afff
Se han modificado 1 ficheros con 2 adiciones y 1 borrados
  1. 2
    1
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

+ 2
- 1
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java Ver fichero

@@ -384,7 +384,8 @@ public abstract class Repository {
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;
}

Cargando…
Cancelar
Guardar