android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-08-08 23:42:08 +03:00
Code Releases Activity

Fix merge conflicts after spotless applied (#4933)

Browse Source
This commit is contained in:
Yuri Schimke
2019-04-12 21:54:08 +01:00
committed by GitHub
parent b89e9ed5c4
commit 9f5a96fe7c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp-logging-interceptor/src/main/java/okhttp3/logging/LoggingEventListener.kt
View File

@@ -150,7 +150,7 @@ class LoggingEventListener private constructor(
open class Factory @JvmOverloads constructor(
private val logger: HttpLoggingInterceptor.Logger = HttpLoggingInterceptor.Logger.DEFAULT
) : EventListener.Factory {
constructor(block: (string: String) -> Unit): this(HttpLoggingInterceptor.Logger(block))
constructor(block: (string: String) -> Unit) : this(HttpLoggingInterceptor.Logger(block))
override fun create(call: Call): EventListener = LoggingEventListener(logger)
}

2
okhttp/src/main/java-templates/okhttp3/internal/Version.kt
View File

@@ -16,4 +16,4 @@
@file:JvmName("Version")
package okhttp3.internal
const val userAgent = "okhttp/${projectVersion}"
const val userAgent = "okhttp/$projectVersion"

2
okhttp/src/main/java/okhttp3/internal/connection/RealConnectionPool.kt
View File

@@ -253,7 +253,7 @@ class RealConnectionPool(
private val executor = ThreadPoolExecutor(
0, // corePoolSize.
Int.MAX_VALUE, // maximumPoolSize.
60L, TimeUnit.SECONDS, // keepAliveTime.
60L, TimeUnit.SECONDS, // keepAliveTime.
SynchronousQueue(),
Util.threadFactory("OkHttp ConnectionPool", true)
)