azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using mapNotNull insteand of map + filterNotNull

Browse Source
This commit is contained in:
Ilya Chernikov
2015-11-25 18:43:36 +01:00
parent fd81063134
commit 96a9634ace
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt
+1 -2
View File
@@ -52,7 +52,7 @@ fun walkDaemons(registryDir: File,
return registryDir.walk() return registryDir.walk()
.map { Pair(it, portExtractor(it.name)) } .map { Pair(it, portExtractor(it.name)) }
.filter { it.second != null && filter(it.first, it.second!!) } .filter { it.second != null && filter(it.first, it.second!!) }
.map { .mapNotNull {
assert(it.second!! > 0 && it.second!! < MAX_PORT_NUMBER) assert(it.second!! > 0 && it.second!! < MAX_PORT_NUMBER)
report(DaemonReportCategory.DEBUG, "found daemon on port ${it.second}, trying to connect") report(DaemonReportCategory.DEBUG, "found daemon on port ${it.second}, trying to connect")
val daemon = tryConnectToDaemon(it.second!!, report) val daemon = tryConnectToDaemon(it.second!!, report)
@@ -62,7 +62,6 @@ fun walkDaemons(registryDir: File,
} }
daemon daemon
} }
.filterNotNull()
} }
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+1 -1
View File
@@ -142,7 +142,7 @@ class CompileServiceImpl(
override fun getClients(): CompileService.CallResult<List<String>> = ifAlive { override fun getClients(): CompileService.CallResult<List<String>> = ifAlive {
synchronized(state.clientProxies) { synchronized(state.clientProxies) {
state.clientProxies.map { it.aliveFlagPath }.filterNotNull() state.clientProxies.mapNotNull { it.aliveFlagPath }
} }
} }