@ -54,6 +54,7 @@ import java.util.Collections;
import java.util.List ;
import java.util.concurrent.TimeUnit ;
import org.eclipse.jgit.errors.PackProtocolException ;
import org.eclipse.jgit.internal.JGitText ;
import org.eclipse.jgit.lib.PersonIdent ;
import org.eclipse.jgit.lib.Repository ;
@ -183,7 +184,7 @@ public class PushCertificateParser {
if ( s . length ( ) < = header . length ( )
| | ! s . startsWith ( header )
| | s . charAt ( header . length ( ) ) ! = ' ' ) {
throw new IO Exception( MessageFormat . format (
throw new PackProtocol Exception( MessageFormat . format (
JGitText . get ( ) . pushCertificateInvalidHeader , header ) ) ;
}
return s . substring ( header . length ( ) + 1 ) ;
@ -214,13 +215,13 @@ public class PushCertificateParser {
try {
version = parseHeader ( pckIn , VERSION ) ;
if ( ! version . equals ( VERSION_0_1 ) ) {
throw new IO Exception( MessageFormat . format (
throw new PackProtocol Exception( MessageFormat . format (
JGitText . get ( ) . pushCertificateInvalidFieldValue , VERSION , version ) ) ;
}
String pusherStr = parseHeader ( pckIn , PUSHER ) ;
pusher = RawParseUtils . parsePersonIdent ( pusherStr ) ;
if ( pusher = = null ) {
throw new IO Exception( MessageFormat . format (
throw new PackProtocol Exception( MessageFormat . format (
JGitText . get ( ) . pushCertificateInvalidFieldValue ,
PUSHER , pusherStr ) ) ;
}
@ -228,11 +229,11 @@ public class PushCertificateParser {
receivedNonce = parseHeader ( pckIn , NONCE ) ;
// An empty line.
if ( ! pckIn . readString ( ) . isEmpty ( ) ) {
throw new IO Exception(
throw new PackProtocol Exception(
JGitText . get ( ) . pushCertificateInvalidHeader ) ;
}
} catch ( EOFException eof ) {
throw new IO Exception(
throw new PackProtocol Exception(
JGitText . get ( ) . pushCertificateInvalidHeader , eof ) ;
}
nonceStatus = nonceGenerator ! = null
@ -264,10 +265,11 @@ public class PushCertificateParser {
}
signature = sig . toString ( ) ;
if ( ! pckIn . readStringRaw ( ) . equals ( END_CERT ) ) {
throw new IOException ( JGitText . get ( ) . pushCertificateInvalidSignature ) ;
throw new PackProtocolException (
JGitText . get ( ) . pushCertificateInvalidSignature ) ;
}
} catch ( EOFException eof ) {
throw new IO Exception(
throw new PackProtocol Exception(
JGitText . get ( ) . pushCertificateInvalidSignature , eof ) ;
}
}