Fix #22160: Retry on SocketException: Unexpected end of file from server

This allows additional exceptions to force a retry. Specifically, the
following subclasses of `SocketException` were considered:

* `BindException` -- shouldn't be thrown, "Signals that an error occurred
   while attempting to bind a socket to a local address and port. Typically,
   the port is in use, or the requested local address could not be assigned."
   This will be raised if it is ever encountered.
* `ConnectException`-- replacing that here, "Signals that an error occurred
   while attempting to connect a socket to a remote address and port.
   Typically, the connection was refused remotely (e.g., no process is
   listening on the remote address/port)."
* `ConnectionResetException` -- "Thrown to indicate a connection reset"
   This seems to be a Java internal class. It is rethrown.
* `NoRouteToHostException` -- "Signals that an error occurred while attempting
   to connect a socket to a remote address and port. Typically, the remote
   host cannot be reached because of an intervening firewall, or if an
   intermediate router is down."
* `PortUnreachableException` -- "Signals that an ICMP Port Unreachable message
   has been received on a connected datagram."

`SocketException` is only thrown in one location in the JDK source code, but
just in case someone decided to throw the exception in a library, we
additionally check that the message matches that from the JDK source. This is,
unfortunately, a bit more fragile than it should be.

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18532 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

src/org/openstreetmap/josm/io/OsmApi.java

@@ -12,6 +12,9 @@
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.NoRouteToHostException;
+import java.net.PortUnreachableException;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -768,8 +771,18 @@ protected final String sendRequest(String requestMethod, String urlSuffix, Strin
                 default:
                     throw new OsmApiException(retCode, errorHeader, errorBody);
                 }
-            } catch (SocketTimeoutException | ConnectException e) {
-                if (retries-- > 0) {
+            } catch (SocketException | SocketTimeoutException e) {
+                /*
+                 * See #22160. While it is only thrown once in JDK sources, it does have subclasses.
+                 * We check for those first, the explicit non-child exception, and then for the message.
+                 */
+                boolean validException = e instanceof SocketTimeoutException
+                        || e instanceof ConnectException
+                        || e instanceof NoRouteToHostException
+                        || e instanceof PortUnreachableException
+                        || (e.getClass().equals(SocketException.class) &&
+                            "Unexpected end of file from server".equals(e.getMessage()));
+                if (retries-- > 0 && validException) {
                     continue;
                 }
                 throw new OsmTransferException(e);