kludge WriteTimeoutSocket to work properly on Android - bug 7513

Author: bshannon

doc/release/CHANGES.txt

@@ -33,6 +33,7 @@ K  7471	InternetAddress.getLocalAddress should use
 	InetAddress.getCanonicalHostName
 K  7472	Store finalizers should not talk to server
 K  7512	NullPointerException if SASL is enabled on Android
+K  7513	write timeouts don't work with SSL on Android
 
 
 		  CHANGES IN THE 1.5.5 RELEASE

mail/src/main/java/com/sun/mail/util/WriteTimeoutSocket.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,6 +44,7 @@
 import java.net.*;
 import java.util.concurrent.*;
 import java.nio.channels.SocketChannel;
+import java.lang.reflect.*;
 
 /**
  * A special Socket that uses a ScheduledExecutorService to
@@ -117,6 +118,22 @@ public void bind(SocketAddress local) throws IOException {
 	socket.bind(local);
     }
 
+    @Override
+    public SocketAddress getRemoteSocketAddress() {
+	return socket.getRemoteSocketAddress();
+    }
+
+    @Override
+    public SocketAddress getLocalSocketAddress() {
+	return socket.getLocalSocketAddress();
+    }
+
+    @Override
+    public void setPerformancePreferences(int connectionTime, int latency,
+                                          int bandwidth) {
+        socket.setPerformancePreferences(connectionTime, latency, bandwidth);
+    }
+
     @Override
     public SocketChannel getChannel() {
 	return socket.getChannel();
@@ -296,6 +313,18 @@ public boolean isInputShutdown() {
     public boolean isOutputShutdown() {
         return socket.isOutputShutdown();
     }
+
+    /**
+     * KLUDGE for Android, which has this illegal non-Java Compatible method.
+     */
+    public FileDescriptor getFileDescriptor$() {
+	try {
+	    Method m = Socket.class.getDeclaredMethod("getFileDescriptor$");
+	    return (FileDescriptor)m.invoke(socket);
+	} catch (Exception ex) {
+	    return null;
+	}
+    }
 }
 
 

mail/src/test/java/com/sun/mail/test/ProtocolHandler.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2009-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -48,6 +48,7 @@
 import java.net.SocketException;
 import java.util.logging.Logger;
 import java.util.logging.Level;
+import javax.net.ssl.SSLException;
 
 /**
  * Handle protocol connection.
@@ -113,6 +114,8 @@ public final void run() {
             //clientSocket.close();
 	} catch (SocketException sex) {
 	    // ignore it, often get "connection reset" when client closes
+	} catch (SSLException sex) {
+	    // ignore it, often occurs when testing SSL
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Error", e);
         } finally {

mail/src/test/java/com/sun/mail/util/WriteTimeoutSocketTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2009-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -40,11 +40,15 @@
 
 package com.sun.mail.util;
 
+import java.lang.reflect.*;
+
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.Properties;
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashSet;
 
 import javax.mail.*;
 import javax.mail.internet.MimeMessage;
@@ -142,6 +146,40 @@ public void testSSLSocketFactory() throws Exception {
 	assertTrue(sf.getSocketWrapped() || sf.getSocketCreated());
     }
 
+    /**
+     * Test that WriteTimeoutSocket overrides all methods from Socket.
+     * XXX - this is kind of hacky since it depends on Method.toString
+     */
+    @Test
+    public void testOverrides() throws Exception {
+	Set<String> socketMethods = new HashSet<String>();
+	Method[] m = java.net.Socket.class.getDeclaredMethods();
+	String className = java.net.Socket.class.getName() + ".";
+	for (int i = 0; i < m.length; i++) {
+	    if (Modifier.isPublic(m[i].getModifiers()) &&
+		!Modifier.isStatic(m[i].getModifiers())) {
+		String name = m[i].toString().
+				    replace("synchronized ", "").
+				    replace(className, "");
+		socketMethods.add(name);
+	    }
+	}
+	Set<String> wtsocketMethods = new HashSet<String>();
+	m = WriteTimeoutSocket.class.getDeclaredMethods();
+	className = WriteTimeoutSocket.class.getName() + ".";
+	for (int i = 0; i < m.length; i++) {
+	    if (Modifier.isPublic(m[i].getModifiers())) {
+		String name = m[i].toString().
+				    replace("synchronized ", "").
+				    replace(className, "");
+		socketMethods.remove(name);
+	    }
+	}
+	for (String s : socketMethods)
+	    System.out.println("WriteTimeoutSocket did not override: " + s);
+	assertTrue(socketMethods.isEmpty());
+    }
+
     private static String[] getAnonCipherSuitesArray() {
 	SSLSocketFactory sf = (SSLSocketFactory)SSLSocketFactory.getDefault();
 	List<String> anon = new ArrayList<String>();