From 9faa3a308b0e537544ee742947afc67dff99a9c7 Mon Sep 17 00:00:00 2001 From: tball Date: Fri, 20 Jan 2017 12:17:03 -0800 Subject: [PATCH] Reversed weak relationship between IosHttpURLConnection and its delegate. Change on 2017/01/20 by tball ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=145113068 --- .../Classes/com/google/j2objc/net/IosHttpURLConnection.java | 2 -- .../com/google/j2objc/net/IosHttpsURLConnection.java | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java b/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java index 6eba1271f4..83e08e37d2 100644 --- a/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java +++ b/jre_emul/Classes/com/google/j2objc/net/IosHttpURLConnection.java @@ -17,7 +17,6 @@ package com.google.j2objc.net; -import com.google.j2objc.annotations.Weak; import com.google.j2objc.io.AsyncPipedNSInputStreamAdapter; import java.io.FileNotFoundException; import java.io.IOException; @@ -102,7 +101,6 @@ public class IosHttpURLConnection extends HttpURLConnection { private final Object getResponseLock = new Object(); // Delegate to handle native security data, to avoid a direct dependency on jre_security. - @Weak private final SecurityDataHandler securityDataHandler; private static final int NATIVE_PIPED_STREAM_BUFFER_SIZE = 8192; diff --git a/jre_emul/Classes/com/google/j2objc/net/IosHttpsURLConnection.java b/jre_emul/Classes/com/google/j2objc/net/IosHttpsURLConnection.java index f5e4df0612..bbd46a9323 100644 --- a/jre_emul/Classes/com/google/j2objc/net/IosHttpsURLConnection.java +++ b/jre_emul/Classes/com/google/j2objc/net/IosHttpsURLConnection.java @@ -17,6 +17,7 @@ package com.google.j2objc.net; +import com.google.j2objc.annotations.RetainedWith; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -30,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; - import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLPeerUnverifiedException; @@ -40,6 +40,10 @@ * whenever possible. */ public class IosHttpsURLConnection extends HttpsURLConnection implements SecurityDataHandler { + + // TODO(tball): extract delegate code into separate private class, which both + // IosHttpURLConnection and this class use as a delegate. + @RetainedWith private final IosHttpURLConnection delegate; private final List serverCertificates = new ArrayList<>();