Where the exception being thrown has a constructor that takes a Throwable, use that instead of instantiating the exception and then explicitly calling initCause. Change-Id: I06a0df407ba751a7af8c1c4a46f9e2714f13dbe3 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v4.10.0.201712302008-r
@@ -178,10 +178,7 @@ public class ManifestParser extends DefaultHandler { | |||
try { | |||
xr.parse(new InputSource(inputStream)); | |||
} catch (SAXException e) { | |||
IOException error = new IOException( | |||
RepoText.get().errorParsingManifestFile); | |||
error.initCause(e); | |||
throw error; | |||
throw new IOException(RepoText.get().errorParsingManifestFile, e); | |||
} | |||
} | |||
@@ -247,34 +247,30 @@ public class FileRepository extends Repository { | |||
private void loadSystemConfig() throws IOException { | |||
try { | |||
systemConfig.load(); | |||
} catch (ConfigInvalidException e1) { | |||
IOException e2 = new IOException(MessageFormat.format(JGitText | |||
} catch (ConfigInvalidException e) { | |||
throw new IOException(MessageFormat.format(JGitText | |||
.get().systemConfigFileInvalid, systemConfig.getFile() | |||
.getAbsolutePath(), e1)); | |||
e2.initCause(e1); | |||
throw e2; | |||
.getAbsolutePath(), | |||
e), e); | |||
} | |||
} | |||
private void loadUserConfig() throws IOException { | |||
try { | |||
userConfig.load(); | |||
} catch (ConfigInvalidException e1) { | |||
IOException e2 = new IOException(MessageFormat.format(JGitText | |||
} catch (ConfigInvalidException e) { | |||
throw new IOException(MessageFormat.format(JGitText | |||
.get().userConfigFileInvalid, userConfig.getFile() | |||
.getAbsolutePath(), e1)); | |||
e2.initCause(e1); | |||
throw e2; | |||
.getAbsolutePath(), | |||
e), e); | |||
} | |||
} | |||
private void loadRepoConfig() throws IOException { | |||
try { | |||
repoConfig.load(); | |||
} catch (ConfigInvalidException e1) { | |||
IOException e2 = new IOException(JGitText.get().unknownRepositoryFormat); | |||
e2.initCause(e1); | |||
throw e2; | |||
} catch (ConfigInvalidException e) { | |||
throw new IOException(JGitText.get().unknownRepositoryFormat, e); | |||
} | |||
} | |||
@@ -97,12 +97,10 @@ public abstract class PackBitmapIndex { | |||
try { | |||
return read(fd, packIndex, reverseIndex); | |||
} catch (IOException ioe) { | |||
final String path = idxFile.getAbsolutePath(); | |||
final IOException err; | |||
err = new IOException(MessageFormat.format( | |||
JGitText.get().unreadablePackIndex, path)); | |||
err.initCause(ioe); | |||
throw err; | |||
throw new IOException(MessageFormat | |||
.format(JGitText.get().unreadablePackIndex, | |||
idxFile.getAbsolutePath()), | |||
ioe); | |||
} finally { | |||
try { | |||
fd.close(); |
@@ -99,11 +99,10 @@ public abstract class PackIndex | |||
try { | |||
return read(fd); | |||
} catch (IOException ioe) { | |||
final String path = idxFile.getAbsolutePath(); | |||
final IOException err; | |||
err = new IOException(MessageFormat.format(JGitText.get().unreadablePackIndex, path)); | |||
err.initCause(ioe); | |||
throw err; | |||
throw new IOException(MessageFormat | |||
.format(JGitText.get().unreadablePackIndex, | |||
idxFile.getAbsolutePath()), | |||
ioe); | |||
} finally { | |||
try { | |||
fd.close(); |
@@ -1184,10 +1184,8 @@ public class RefDirectory extends RefDatabase { | |||
n--; | |||
String content = RawParseUtils.decode(buf, 0, n); | |||
IOException ioException = new IOException(MessageFormat.format(JGitText.get().notARef, | |||
name, content)); | |||
ioException.initCause(notRef); | |||
throw ioException; | |||
throw new IOException(MessageFormat.format(JGitText.get().notARef, | |||
name, content), notRef); | |||
} | |||
return new LooseUnpeeled(otherSnapshot, name, id); | |||
} |
@@ -1531,9 +1531,7 @@ public class PackWriter implements AutoCloseable { | |||
if (err instanceof IOException) | |||
throw (IOException) err; | |||
IOException fail = new IOException(err.getMessage()); | |||
fail.initCause(err); | |||
throw fail; | |||
throw new IOException(err.getMessage(), err); | |||
} | |||
endPhase(monitor); | |||
} |
@@ -538,11 +538,9 @@ public class IndexDiff { | |||
.equals(localIgnoreSubmoduleMode)) | |||
continue; | |||
} catch (ConfigInvalidException e) { | |||
IOException e1 = new IOException(MessageFormat.format( | |||
throw new IOException(MessageFormat.format( | |||
JGitText.get().invalidIgnoreParamSubmodule, | |||
smw.getPath())); | |||
e1.initCause(e); | |||
throw e1; | |||
smw.getPath()), e); | |||
} | |||
Repository subRepo = smw.getRepository(); | |||
if (subRepo != null) { |
@@ -171,9 +171,8 @@ public class FileBasedConfig extends StoredConfig { | |||
clear(); | |||
snapshot = newSnapshot; | |||
} catch (IOException e) { | |||
final IOException e2 = new IOException(MessageFormat.format(JGitText.get().cannotReadFile, getFile())); | |||
e2.initCause(e); | |||
throw e2; | |||
throw new IOException(MessageFormat | |||
.format(JGitText.get().cannotReadFile, getFile()), e); | |||
} catch (ConfigInvalidException e) { | |||
throw new ConfigInvalidException(MessageFormat.format(JGitText.get().cannotReadFile, getFile()), e); | |||
} |
@@ -707,10 +707,10 @@ public class AmazonS3 { | |||
try { | |||
xr.parse(new InputSource(in)); | |||
} catch (SAXException parsingError) { | |||
final IOException p; | |||
p = new IOException(MessageFormat.format(JGitText.get().errorListing, prefix)); | |||
p.initCause(parsingError); | |||
throw p; | |||
throw new IOException( | |||
MessageFormat.format( | |||
JGitText.get().errorListing, prefix), | |||
parsingError); | |||
} finally { | |||
in.close(); | |||
} |
@@ -549,9 +549,7 @@ abstract class HttpAuthMethod { | |||
conn.setRequestProperty(HDR_AUTHORIZATION, getType().getSchemeName() | |||
+ " " + Base64.encodeBytes(token)); //$NON-NLS-1$ | |||
} catch (GSSException e) { | |||
IOException ioe = new IOException(); | |||
ioe.initCause(e); | |||
throw ioe; | |||
throw new IOException(e); | |||
} | |||
} | |||
} |
@@ -115,10 +115,9 @@ abstract class WalkEncryption { | |||
} | |||
IOException error(final Throwable why) { | |||
final IOException e; | |||
e = new IOException(MessageFormat.format(JGitText.get().encryptionError, why.getMessage())); | |||
e.initCause(why); | |||
return e; | |||
return new IOException(MessageFormat | |||
.format(JGitText.get().encryptionError, | |||
why.getMessage()), why); | |||
} | |||
private static class NoEncryption extends WalkEncryption { |