fix bad merge (square#8)

mjbenedict · Apr 4, 2017 · e975200 · e975200
1 parent e4b3aa5
commit e975200
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/okhttp/src/main/java/okhttp3/OkHttpClient.java b/okhttp/src/main/java/okhttp3/OkHttpClient.java
@@ -216,7 +216,6 @@ public void apply(ConnectionSpec tlsConfiguration, SSLSocket sslSocket, boolean
   final int readTimeout;
   final int writeTimeout;
   final int pingInterval;
-  final EventListener eventListener;
   final EventListener.Factory eventListenerFactory;
 
   public OkHttpClient() {
@@ -235,7 +234,6 @@ public OkHttpClient() {
     this.cache = builder.cache;
     this.internalCache = builder.internalCache;
     this.socketFactory = builder.socketFactory;
-    this.eventListener = builder.eventListener;
     this.eventListenerFactory = builder.eventListenerFactory;
 
     boolean isTLS = false;

diff --git a/okhttp/src/main/java/okhttp3/RealCall.java b/okhttp/src/main/java/okhttp3/RealCall.java
@@ -49,11 +49,7 @@ final class RealCall implements Call {
     this.originalRequest = originalRequest;
     this.forWebSocket = forWebSocket;
     this.retryAndFollowUpInterceptor = new RetryAndFollowUpInterceptor(client, forWebSocket);
-    if (null == eventListenerFactory) {
-      this.eventListener = client.eventListener();
-    } else {
-      this.eventListener = eventListenerFactory.create(this);
-    }
+    this.eventListener = eventListenerFactory.create(this);
   }
 
   @Override public Request request() {