]> source.dussan.org Git - jgit.git/commitdiff
InternalPushConnection: don't swallow RuntimeException 91/130691/5
authorHan-Wen Nienhuys <hanwen@google.com>
Tue, 9 Oct 2018 14:22:06 +0000 (16:22 +0200)
committerHan-Wen Nienhuys <hanwen@google.com>
Mon, 15 Oct 2018 14:45:19 +0000 (16:45 +0200)
Uncaught exceptions are handled by java.lang.Thread's handler, which
prints it to stderr.

This is useful because InternalPushConnection is used in tests, and
during development, the server side may have programming errors that
manifest as RuntimeExceptions.

Before this change, all types of failures would lead to a uniform
failure message "test://test/conn0: push not permitted" on the client.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Change-Id: I0983cbeb86d36fa7a9313373f5fce54971f804ec

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

index 732be63dc19d2894d06ea3936fd3ea60301c9ac9..f05e0b8c7d8231a521871d5be9254101ee4e4cc9 100644 (file)
@@ -46,6 +46,7 @@ package org.eclipse.jgit.transport;
 import java.io.IOException;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.io.UncheckedIOException;
 
 import org.eclipse.jgit.errors.TransportException;
 import org.eclipse.jgit.internal.JGitText;
@@ -103,10 +104,13 @@ class InternalPushConnection<C> extends BasePackPushConnection {
                                        // Ignored. Client cannot use this repository.
                                } catch (ServiceNotAuthorizedException e) {
                                        // Ignored. Client cannot use this repository.
-                               } catch (IOException err) {
-                                       // Client side of the pipes should report the problem.
-                               } catch (RuntimeException err) {
-                                       // Clients side will notice we went away, and report.
+                               } 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.
+                                       throw new UncheckedIOException(e);
                                } finally {
                                        try {
                                                out_r.close();