Browse Source

Join catch sections using multicatch

Change-Id: I1a9112e6a4f938638c599b489cb0858eca27ab91
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-5.4
Carsten Hammer 6 years ago committed by Matthias Sohn
parent
commit
c0268f899e
  1. 8
      org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
  2. 4
      org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
  3. 6
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java
  4. 19
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java
  5. 20
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
  6. 5
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
  7. 4
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java
  8. 5
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java
  9. 5
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java
  10. 5
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java
  11. 5
      org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java
  12. 4
      org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java
  13. 16
      org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
  14. 9
      org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
  15. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java
  16. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleInitCommand.java
  17. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleStatusCommand.java
  18. 4
      org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java
  19. 16
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
  20. 24
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
  21. 8
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java
  22. 4
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaWindow.java
  23. 4
      org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java
  24. 4
      org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java
  25. 5
      org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java
  26. 5
      org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java
  27. 10
      org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java
  28. 4
      org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java
  29. 10
      org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalFetchConnection.java
  30. 14
      org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalPushConnection.java
  31. 5
      org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java
  32. 12
      org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java
  33. 17
      org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
  34. 6
      org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java
  35. 9
      org.eclipse.jgit/src/org/eclipse/jgit/util/GSSManagerFactory.java
  36. 4
      org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java

8
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java

@ -554,13 +554,7 @@ public abstract class LocalDiskRepositoryTestCase {
try {
write(f, body);
return f;
} catch (Error e) {
f.delete();
throw e;
} catch (RuntimeException e) {
f.delete();
throw e;
} catch (IOException e) {
} catch (Error | RuntimeException | IOException e) {
f.delete();
throw e;
}

4
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java

@ -486,9 +486,7 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase {
git.branchCreate().setName(branch).setStartPoint(commit).call();
return commit;
} catch (IOException e) {
throw new RuntimeException(e);
} catch (GitAPIException e) {
} catch (IOException | GitAPIException e) {
throw new RuntimeException(e);
}
}

6
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandCatalog.java

@ -163,13 +163,9 @@ public class CommandCatalog {
final Class<? extends TextBuiltin> clazz;
try {
clazz = Class.forName(cn, false, ldr).asSubclass(TextBuiltin.class);
} catch (ClassNotFoundException notBuiltin) {
} catch (ClassNotFoundException | ClassCastException notBuiltin) {
// Doesn't exist, even though the service entry is present.
//
return;
} catch (ClassCastException notBuiltin) {
// Isn't really a builtin, even though its listed as such.
//
return;
}

19
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CommandRef.java

@ -156,24 +156,19 @@ public class CommandRef {
final Constructor<? extends TextBuiltin> c;
try {
c = impl.getDeclaredConstructor();
} catch (SecurityException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (NoSuchMethodException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (SecurityException | NoSuchMethodException e) {
throw new RuntimeException(MessageFormat
.format(CLIText.get().cannotCreateCommand, getName(), e));
}
c.setAccessible(true);
final TextBuiltin r;
try {
r = c.newInstance();
} catch (InstantiationException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (IllegalAccessException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (IllegalArgumentException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (InvocationTargetException e) {
throw new RuntimeException(MessageFormat.format(CLIText.get().cannotCreateCommand, getName(), e));
} catch (InstantiationException | IllegalAccessException
| IllegalArgumentException | InvocationTargetException e) {
throw new RuntimeException(MessageFormat
.format(CLIText.get().cannotCreateCommand, getName(), e));
}
r.setCommandName(getName());
return r;

20
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java

@ -330,22 +330,12 @@ public class Main {
install("org.eclipse.jgit.console.ConsoleAuthenticator"); //$NON-NLS-1$
install("org.eclipse.jgit.console.ConsoleCredentialsProvider"); //$NON-NLS-1$
return true;
} catch (ClassNotFoundException e) {
} catch (ClassNotFoundException | NoClassDefFoundError
| UnsupportedClassVersionError e) {
return false;
} catch (NoClassDefFoundError e) {
return false;
} catch (UnsupportedClassVersionError e) {
return false;
} catch (IllegalArgumentException e) {
throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (SecurityException e) {
throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (IllegalAccessException e) {
throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (InvocationTargetException e) {
throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
} catch (NoSuchMethodException e) {
} catch (IllegalArgumentException | SecurityException
| IllegalAccessException | InvocationTargetException
| NoSuchMethodException e) {
throw new RuntimeException(CLIText.get().cannotSetupConsole, e);
}
}

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java

@ -338,12 +338,9 @@ class DiffAlgorithms extends TextBuiltin {
}
}
}
} catch (IllegalArgumentException e) {
throw die("Cannot determine names", e); //$NON-NLS-1$
} catch (IllegalAccessException e) {
} catch (IllegalArgumentException | IllegalAccessException e) {
throw die("Cannot determine names", e); //$NON-NLS-1$
}
return all;
}

4
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java

@ -403,9 +403,7 @@ class TextHashFunctions extends TextBuiltin {
folds.add(fold);
}
}
} catch (IllegalArgumentException e) {
throw new RuntimeException("Cannot determine names", e); //$NON-NLS-1$
} catch (IllegalAccessException e) {
} catch (IllegalArgumentException | IllegalAccessException e) {
throw new RuntimeException("Cannot determine names", e); //$NON-NLS-1$
}

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/AbstractTreeIteratorHandler.java

@ -133,10 +133,7 @@ public class AbstractTreeIteratorHandler extends
final CanonicalTreeParser p = new CanonicalTreeParser();
try (ObjectReader curs = clp.getRepository().newObjectReader()) {
p.reset(curs, clp.getRevWalk().parseTree(id));
} catch (MissingObjectException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notATree), name);
} catch (IncorrectObjectTypeException e) {
} catch (MissingObjectException | IncorrectObjectTypeException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notATree), name);
} catch (IOException e) {

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevCommitHandler.java

@ -130,10 +130,7 @@ public class RevCommitHandler extends OptionHandler<RevCommit> {
final RevCommit c;
try {
c = clp.getRevWalk().parseCommit(id);
} catch (MissingObjectException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notACommit), name);
} catch (IncorrectObjectTypeException e) {
} catch (MissingObjectException | IncorrectObjectTypeException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notACommit), name);
} catch (IOException e) {

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/RevTreeHandler.java

@ -102,10 +102,7 @@ public class RevTreeHandler extends OptionHandler<RevTree> {
final RevTree c;
try {
c = clp.getRevWalk().parseTree(id);
} catch (MissingObjectException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notATree), name);
} catch (IncorrectObjectTypeException e) {
} catch (MissingObjectException | IncorrectObjectTypeException e) {
throw new CmdLineException(clp,
CLIText.format(CLIText.get().notATree), name);
} catch (IOException e) {

5
org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java

@ -177,10 +177,7 @@ public class SshdSession implements RemoteSession {
timeoutMillis -= TimeUnit.NANOSECONDS
.toMillis(System.nanoTime() - start);
}
} catch (IOException e) {
exec.close(true);
throw e;
} catch (RuntimeException e) {
} catch (IOException | RuntimeException e) {
exec.close(true);
throw e;
}

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java

@ -167,9 +167,7 @@ public class GcPackRefsTest extends GcTestCase {
try {
refUpdateLockedRef.await();
packRefsDone.await();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (BrokenBarrierException e) {
} catch (InterruptedException | BrokenBarrierException e) {
Thread.currentThread().interrupt();
}
return super.isForceUpdate();

16
org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java

@ -282,13 +282,11 @@ public class LogCommand extends GitCommand<Iterable<RevCommit>> {
RevCommit commit = null;
try {
commit = walk.parseCommit(objectId);
} catch (MissingObjectException e) {
// ignore: the ref points to an object that does not exist;
// it should be ignored as traversal starting point.
} catch (IncorrectObjectTypeException e) {
// ignore: the ref points to an object that is not a commit
// (e.g. a tree or a blob);
// it should be ignored as traversal starting point.
} catch (MissingObjectException | IncorrectObjectTypeException e) {
// ignore as traversal starting point:
// - the ref points to an object that does not exist
// - the ref points to an object that is not a commit (e.g. a
// tree or a blob)
}
if (commit != null)
add(commit);
@ -348,9 +346,7 @@ public class LogCommand extends GitCommand<Iterable<RevCommit>> {
} else
walk.markUninteresting(walk.lookupCommit(start));
return this;
} catch (MissingObjectException e) {
throw e;
} catch (IncorrectObjectTypeException e) {
} catch (MissingObjectException | IncorrectObjectTypeException e) {
throw e;
} catch (IOException e) {
throw new JGitInternalException(MessageFormat.format(

9
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java

@ -1295,13 +1295,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
}
}
return newCommit;
} catch (RefAlreadyExistsException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (RefNotFoundException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (InvalidRefNameException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (CheckoutConflictException e) {
} catch (RefAlreadyExistsException | RefNotFoundException
| InvalidRefNameException | CheckoutConflictException e) {
throw new JGitInternalException(e.getMessage(), e);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java

@ -238,9 +238,7 @@ public class SubmoduleAddCommand extends
modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION,
name, ConfigConstants.CONFIG_KEY_URL, uri);
modulesConfig.save();
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (ConfigInvalidException e) {
} catch (IOException | ConfigInvalidException e) {
throw new JGitInternalException(e.getMessage(), e);
}

4
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleInitCommand.java

@ -128,9 +128,7 @@ public class SubmoduleInitCommand extends GitCommand<Collection<String>> {
if (!initialized.isEmpty())
config.save();
return initialized;
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (ConfigInvalidException e) {
} catch (IOException | ConfigInvalidException e) {
throw new JGitInternalException(e.getMessage(), e);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleStatusCommand.java

@ -108,9 +108,7 @@ public class SubmoduleStatusCommand extends
statuses.put(status.getPath(), status);
}
return statuses;
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (ConfigInvalidException e) {
} catch (IOException | ConfigInvalidException e) {
throw new JGitInternalException(e.getMessage(), e);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java

@ -162,9 +162,7 @@ public class SubmoduleSyncCommand extends GitCommand<Map<String, String>> {
if (!synced.isEmpty())
config.save();
return synced;
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
} catch (ConfigInvalidException e) {
} catch (IOException | ConfigInvalidException e) {
throw new JGitInternalException(e.getMessage(), e);
}
}

16
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java vendored

@ -253,13 +253,7 @@ public class DirCache {
try {
c.read();
} catch (IOException e) {
c.unlock();
throw e;
} catch (RuntimeException e) {
c.unlock();
throw e;
} catch (Error e) {
} catch (IOException | RuntimeException | Error e) {
c.unlock();
throw e;
}
@ -636,13 +630,7 @@ public class DirCache {
try (OutputStream o = tmp.getOutputStream();
OutputStream bo = new BufferedOutputStream(o)) {
writeTo(liveFile.getParentFile(), bo);
} catch (IOException err) {
tmp.unlock();
throw err;
} catch (RuntimeException err) {
tmp.unlock();
throw err;
} catch (Error err) {
} catch (IOException | RuntimeException | Error err) {
tmp.unlock();
throw err;
}

24
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java

@ -239,13 +239,7 @@ public class LockFile {
// Don't worry about a file that doesn't exist yet, it
// conceptually has no current content to copy.
//
} catch (IOException ioe) {
unlock();
throw ioe;
} catch (RuntimeException ioe) {
unlock();
throw ioe;
} catch (Error ioe) {
} catch (IOException | RuntimeException | Error ioe) {
unlock();
throw ioe;
}
@ -299,13 +293,7 @@ public class LockFile {
}
os.close();
os = null;
} catch (IOException ioe) {
unlock();
throw ioe;
} catch (RuntimeException ioe) {
unlock();
throw ioe;
} catch (Error ioe) {
} catch (IOException | RuntimeException | Error ioe) {
unlock();
throw ioe;
}
@ -353,13 +341,7 @@ public class LockFile {
os.getChannel().force(true);
out.close();
os = null;
} catch (IOException ioe) {
unlock();
throw ioe;
} catch (RuntimeException ioe) {
unlock();
throw ioe;
} catch (Error ioe) {
} catch (IOException | RuntimeException | Error ioe) {
unlock();
throw ioe;
}

8
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java

@ -298,13 +298,7 @@ public class WindowCache {
if (mmap)
return pack.mmap(offset, windowSize);
return pack.read(offset, windowSize);
} catch (IOException e) {
close(pack);
throw e;
} catch (RuntimeException e) {
close(pack);
throw e;
} catch (Error e) {
} catch (IOException | RuntimeException | Error e) {
close(pack);
throw e;
}

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/DeltaWindow.java

@ -365,9 +365,7 @@ final class DeltaWindow {
resObj.setCachedDelta(deltaCache.cache(zbuf, len, deltaLen));
resObj.setCachedSize(deltaLen);
} catch (IOException err) {
deltaCache.credit(deltaLen);
} catch (OutOfMemoryError err) {
} catch (IOException | OutOfMemoryError err) {
deltaCache.credit(deltaLen);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/nls/GlobalBundleCache.java

@ -97,9 +97,7 @@ class GlobalBundleCache {
bundles.put(type, bundle);
}
return (T) bundle;
} catch (InstantiationException e) {
throw new Error(e);
} catch (IllegalAccessException e) {
} catch (InstantiationException | IllegalAccessException e) {
throw new Error(e);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/nls/TranslationBundle.java

@ -182,9 +182,7 @@ public abstract class TranslationBundle {
field.set(this, translatedText);
} catch (MissingResourceException e) {
throw new TranslationStringMissingException(bundleClass, locale, field.getName(), e);
} catch (IllegalArgumentException e) {
throw new Error(e);
} catch (IllegalAccessException e) {
} catch (IllegalArgumentException | IllegalAccessException e) {
throw new Error(e);
}
}

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackConnection.java

@ -182,10 +182,7 @@ abstract class BasePackConnection extends BaseConnection {
} catch (TransportException err) {
close();
throw err;
} catch (IOException err) {
close();
throw new TransportException(err.getMessage(), err);
} catch (RuntimeException err) {
} catch (IOException | RuntimeException err) {
close();
throw new TransportException(err.getMessage(), err);
}

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java

@ -400,10 +400,7 @@ public abstract class BasePackFetchConnection extends BasePackConnection
} catch (CancelledException ce) {
close();
return; // Caller should test (or just know) this themselves.
} catch (IOException err) {
close();
throw new TransportException(err.getMessage(), err);
} catch (RuntimeException err) {
} catch (IOException | RuntimeException err) {
close();
throw new TransportException(err.getMessage(), err);
}

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleFetchConnection.java

@ -112,10 +112,7 @@ class BundleFetchConnection extends BaseFetchConnection {
} catch (TransportException err) {
close();
throw err;
} catch (IOException err) {
close();
throw new TransportException(transport.uri, err.getMessage(), err);
} catch (RuntimeException err) {
} catch (IOException | RuntimeException err) {
close();
throw new TransportException(transport.uri, err.getMessage(), err);
}
@ -205,10 +202,7 @@ class BundleFetchConnection extends BaseFetchConnection {
packLock = parser.parse(NullProgressMonitor.INSTANCE);
ins.flush();
}
} catch (IOException err) {
close();
throw new TransportException(transport.uri, err.getMessage(), err);
} catch (RuntimeException err) {
} catch (IOException | RuntimeException err) {
close();
throw new TransportException(transport.uri, err.getMessage(), err);
}

4
org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java

@ -78,9 +78,7 @@ public class HMACSHA1NonceGenerator implements NonceGenerator {
SecretKeySpec signingKey = new SecretKeySpec(keyBytes, "HmacSHA1"); //$NON-NLS-1$
mac = Mac.getInstance("HmacSHA1"); //$NON-NLS-1$
mac.init(signingKey);
} catch (InvalidKeyException e) {
throw new IllegalStateException(e);
} catch (NoSuchAlgorithmException e) {
} catch (InvalidKeyException | NoSuchAlgorithmException e) {
throw new IllegalStateException(e);
}
}

10
org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalFetchConnection.java

@ -107,16 +107,12 @@ class InternalFetchConnection<C> extends BasePackFetchConnection {
try {
final UploadPack rp = uploadPackFactory.create(req, remote);
rp.upload(out_r, in_w, null);
} catch (ServiceNotEnabledException e) {
} catch (ServiceNotEnabledException
| ServiceNotAuthorizedException e) {
// Ignored. Client cannot use this repository.
} catch (ServiceNotAuthorizedException e) {
// Ignored. Client cannot use this repository.
} catch (IOException err) {
} catch (IOException | RuntimeException err) {
// Client side of the pipes should report the problem.
err.printStackTrace();
} catch (RuntimeException err) {
// Client side will notice we went away, and report.
err.printStackTrace();
} finally {
try {
out_r.close();

14
org.eclipse.jgit/src/org/eclipse/jgit/transport/InternalPushConnection.java

@ -100,16 +100,14 @@ class InternalPushConnection<C> extends BasePackPushConnection {
try {
final ReceivePack rp = receivePackFactory.create(req, remote);
rp.receive(out_r, in_w, System.err);
} catch (ServiceNotEnabledException e) {
// Ignored. Client cannot use this repository.
} catch (ServiceNotAuthorizedException e) {
} catch (ServiceNotEnabledException
| ServiceNotAuthorizedException e) {
// Ignored. Client cannot use this repository.
} catch (IOException e) {
// Since the InternalPushConnection
// is used in tests, we want to avoid hiding exceptions
// because they can point to programming errors on the server
// side. By rethrowing, the default handler will dump it
// to stderr.
// Since the InternalPushConnection is used in tests, we
// want to avoid hiding exceptions because they can point to
// programming errors on the server side. By rethrowing, the
// default handler will dump it to stderr.
throw new UncheckedIOException(e);
} finally {
try {

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java

@ -180,10 +180,7 @@ public abstract class Transport implements AutoCloseable {
TransportProtocol proto;
try {
proto = (TransportProtocol) f.get(null);
} catch (IllegalArgumentException e) {
// If we cannot access the field, don't.
continue;
} catch (IllegalAccessException e) {
} catch (IllegalArgumentException | IllegalAccessException e) {
// If we cannot access the field, don't.
continue;
}

12
org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java

@ -363,9 +363,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport,
try (InputStream in = openInputStream(c)) {
return getConnection(c, in, service);
}
} catch (NotSupportedException err) {
throw err;
} catch (TransportException err) {
} catch (NotSupportedException | TransportException err) {
throw err;
} catch (IOException err) {
throw new TransportException(uri, JGitText.get().errorReadingInfoRefs, err);
@ -449,9 +447,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport,
throw new NotSupportedException(msg);
}
}
} catch (NotSupportedException err) {
throw err;
} catch (TransportException err) {
} catch (NotSupportedException | TransportException err) {
throw err;
} catch (IOException err) {
throw new TransportException(uri, JGitText.get().errorReadingInfoRefs, err);
@ -575,9 +571,7 @@ public class TransportHttp extends HttpTransport implements WalkTransport,
String err = status + " " + conn.getResponseMessage(); //$NON-NLS-1$
throw new TransportException(uri, err);
}
} catch (NotSupportedException e) {
throw e;
} catch (TransportException e) {
} catch (NotSupportedException | TransportException e) {
throw e;
} catch (SSLHandshakeException e) {
handleSslFailure(e);

17
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

@ -2002,21 +2002,12 @@ public class UploadPack {
} catch (ServiceMayNotContinueException noPack) {
// This was already reported on (below).
throw noPack;
} catch (IOException err) {
if (reportInternalServerErrorOverSideband())
} catch (IOException | RuntimeException | Error err) {
if (reportInternalServerErrorOverSideband()) {
throw new UploadPackInternalServerErrorException(err);
else
throw err;
} catch (RuntimeException err) {
if (reportInternalServerErrorOverSideband())
throw new UploadPackInternalServerErrorException(err);
else
throw err;
} catch (Error err) {
if (reportInternalServerErrorOverSideband())
throw new UploadPackInternalServerErrorException(err);
else
} else {
throw err;
}
}
} else {
sendPack(false, req, accumulator, allTags, unshallowCommits, deepenNots);

6
org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java

@ -127,11 +127,7 @@ public class FileResolver<C> implements RepositoryResolver<C> {
} else
throw new ServiceNotEnabledException();
} catch (RuntimeException e) {
db.close();
throw new RepositoryNotFoundException(name, e);
} catch (IOException e) {
} catch (RuntimeException | IOException e) {
db.close();
throw new RepositoryNotFoundException(name, e);

9
org.eclipse.jgit/src/org/eclipse/jgit/util/GSSManagerFactory.java

@ -145,13 +145,8 @@ public abstract class GSSManagerFactory {
return (GSSManager) GSS_MANAGER_IMPL_CONSTRUCTOR
.newInstance(httpCaller);
} catch (InstantiationException e) {
throw new Error(e);
} catch (IllegalAccessException e) {
throw new Error(e);
} catch (IllegalArgumentException e) {
throw new Error(e);
} catch (InvocationTargetException e) {
} catch (InstantiationException | IllegalAccessException
| IllegalArgumentException | InvocationTargetException e) {
throw new Error(e);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/util/HttpSupport.java

@ -303,9 +303,7 @@ public class HttpSupport {
try {
conn.configure(null, trustAllCerts, null);
conn.setHostnameVerifier(new DummyHostnameVerifier());
} catch (KeyManagementException e) {
throw new IOException(e.getMessage());
} catch (NoSuchAlgorithmException e) {
} catch (KeyManagementException | NoSuchAlgorithmException e) {
throw new IOException(e.getMessage());
}
}

Loading…
Cancel
Save