Browse Source

Throw invalid ref exception instead of invalid remote exception

ReflogCommand command was throwing an incorrect exception type
when an IOException was wrapped and rethrown from the underlying
ReflogReader.  The IOException cause is now provided to the thrown
exception as well.

Change-Id: I9f1842c2d414d3e9c658843f9b448bc18891748e
stable-1.3
Kevin Sawicki 13 years ago
parent
commit
4535a9e2a3
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java
  2. 8
      org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java

6
org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java

@ -47,7 +47,7 @@ import java.text.MessageFormat;
import java.util.Collection; import java.util.Collection;
import org.eclipse.jgit.JGitText; import org.eclipse.jgit.JGitText;
import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.InvalidRefNameException;
import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.ReflogEntry; import org.eclipse.jgit.storage.file.ReflogEntry;
@ -91,8 +91,8 @@ public class ReflogCommand extends GitCommand<Collection<ReflogEntry>> {
ReflogReader reader = new ReflogReader(repo, ref); ReflogReader reader = new ReflogReader(repo, ref);
return reader.getReverseEntries(); return reader.getReverseEntries();
} catch (IOException e) { } catch (IOException e) {
throw new InvalidRemoteException(MessageFormat.format( throw new InvalidRefNameException(MessageFormat.format(
JGitText.get().cannotRead, ref)); JGitText.get().cannotRead, ref), e);
} }
} }

8
org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRefNameException.java

@ -49,4 +49,12 @@ public class InvalidRefNameException extends GitAPIException {
public InvalidRefNameException(String msg) { public InvalidRefNameException(String msg) {
super(msg); super(msg);
} }
/**
* @param msg
* @param cause
*/
public InvalidRefNameException(String msg, Throwable cause) {
super(msg, cause);
}
} }

Loading…
Cancel
Save