Commitdb1b91b

committed

Merge branch 'master' of github.com-at055612:lmdbjava/lmdbjava

2 parents1800dd6 +3136919 commitdb1b91bCopy full SHA for db1b91b

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`importjava.io.IOException;`
`22`	`22`	`importjava.nio.file.Files;`
`23`	`23`	`importjava.nio.file.Paths;`
	`24`	`+importjava.util.stream.Stream;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* Determines the name of the target LMDB native library.`
`@@ -171,10 +172,8 @@ private static String resolveToolchain(final String os) {`
`171`	`172`	`}`
`172`	`173`
`173`	`174`	`privatestaticbooleanisMuslLibc() {`
`174`		`-try {`
`175`		`-returnFiles.lines(Paths.get("/proc/self/maps"))`
`176`		`- .filter(line ->line.contains("libc"))`
`177`		`- .anyMatch(line ->line.contains("musl"));`
	`175`	`+try (Stream<String>lines =Files.lines(Paths.get("/proc/self/maps"))) {`
	`176`	`+returnlines.anyMatch(line ->line.contains("/ld-musl"));`
`178`	`177`	`}catch (finalIOExceptione) {`
`179`	`178`	`returnfalse;`
`180`	`179`	`}`

Comments

(0)