commit 741ca79db8c9076ba1c9f2a47cfa839da9e3f53f
author Brian Carlstrom <bdc@google.com> Tue Jan 04 13:38:02 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 04 13:38:02 2011 -0800
tree e50af9d13017d3633aa2f66408f5e7e8993099c5
parent 15921ecc8d2446dd23f49190d0b06b31f752de9b
parent 843bcb6f4f65c0cdca327c6467813b88c52042f3

am 843bcb6f: DefaultRequestDirector should ignore IOExceptions from stale connections

* commit '843bcb6f4f65c0cdca327c6467813b88c52042f3':
  DefaultRequestDirector should ignore IOExceptions from stale connections

src/org/apache/http/impl/client/DefaultRequestDirector.java

diff --git a/src/org/apache/http/impl/client/DefaultRequestDirector.java b/src/org/apache/http/impl/client/DefaultRequestDirector.java
index 6df6246..b8f380b 100644
--- a/src/org/apache/http/impl/client/DefaultRequestDirector.java
+++ b/src/org/apache/http/impl/client/DefaultRequestDirector.java
@@ -334,7 +334,18 @@
                         this.log.debug("Stale connection check");
                         if (managedConn.isStale()) {
                             this.log.debug("Stale connection detected");
-                            managedConn.close();
+                            // BEGIN android-changed
+                            try {
+                                managedConn.close();
+                            } catch (IOException ignored) {
+                                // SSLSocket's will throw IOException
+                                // because they can't send a "close
+                                // notify" protocol message to the
+                                // server. Just supresss any
+                                // exceptions related to closing the
+                                // stale connection.
+                            }
+                            // END android-changed
                         }
                     }
                 }