diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/StoredObjectRepresentationNotAvailableException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/StoredObjectRepresentationNotAvailableException.java index ab9ea1d7f..8fa14c7d3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/StoredObjectRepresentationNotAvailableException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/StoredObjectRepresentationNotAvailableException.java @@ -56,8 +56,12 @@ public class StoredObjectRepresentationNotAvailableException extends Exception { * * @param otp * the object whose current representation is no longer present. + * @deprecated use + * {@link #StoredObjectRepresentationNotAvailableException(ObjectToPack, Throwable)} + * instead. * @since 3.0 */ + @Deprecated public StoredObjectRepresentationNotAvailableException(ObjectToPack otp) { // Do nothing. } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index 54b0cb554..4886ed714 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -660,16 +660,12 @@ void copyAsIs(PackOutputStream out, DfsObjectToPack src, Long.valueOf(src.offset), getFileName())); corruptObject.initCause(dataFormat); - StoredObjectRepresentationNotAvailableException gone; - gone = new StoredObjectRepresentationNotAvailableException(src); - gone.initCause(corruptObject); - throw gone; + throw new StoredObjectRepresentationNotAvailableException(src, + corruptObject); } catch (IOException ioError) { - StoredObjectRepresentationNotAvailableException gone; - gone = new StoredObjectRepresentationNotAvailableException(src); - gone.initCause(ioError); - throw gone; + throw new StoredObjectRepresentationNotAvailableException(src, + ioError); } if (quickCopy != null) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index febbb9602..6fbb0df62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -518,16 +518,12 @@ private void copyAsIs2(PackOutputStream out, LocalObjectToPack src, Long.valueOf(src.offset), getPackFile())); corruptObject.initCause(dataFormat); - StoredObjectRepresentationNotAvailableException gone; - gone = new StoredObjectRepresentationNotAvailableException(src); - gone.initCause(corruptObject); - throw gone; + throw new StoredObjectRepresentationNotAvailableException(src, + corruptObject); } catch (IOException ioError) { - StoredObjectRepresentationNotAvailableException gone; - gone = new StoredObjectRepresentationNotAvailableException(src); - gone.initCause(ioError); - throw gone; + throw new StoredObjectRepresentationNotAvailableException(src, + ioError); } if (quickCopy != null) { @@ -612,11 +608,8 @@ private synchronized void beginCopyAsIs(ObjectToPack otp) try { doOpen(); } catch (IOException thisPackNotValid) { - StoredObjectRepresentationNotAvailableException gone; - - gone = new StoredObjectRepresentationNotAvailableException(otp); - gone.initCause(thisPackNotValid); - throw gone; + throw new StoredObjectRepresentationNotAvailableException(otp, + thisPackNotValid); } } }