Skip to content

Commit 9d92b94

Browse files
authored
Merge pull request #341 from scalecube/update-commons
Update sc-commons
2 parents aadcea2 + 120fee2 commit 9d92b94

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.net.InetAddress;
2121
import java.nio.ByteBuffer;
2222
import java.nio.file.Path;
23+
import java.nio.file.Paths;
2324
import java.time.Duration;
2425
import java.util.ArrayList;
2526
import java.util.Arrays;
@@ -509,8 +510,8 @@ private Mono<Void> syncMembership(SyncData syncData, boolean onStart) {
509510
}
510511

511512
private static boolean areNamespacesRelated(String namespace1, String namespace2) {
512-
Path ns1 = Path.of(namespace1);
513-
Path ns2 = Path.of(namespace2);
513+
Path ns1 = Paths.get(namespace1);
514+
Path ns2 = Paths.get(namespace2);
514515

515516
if (ns1.compareTo(ns2) == 0) {
516517
return true;

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.scalecube</groupId>
99
<artifactId>scalecube-parent-pom</artifactId>
10-
<version>0.1.2-RC1</version>
10+
<version>0.1.2-RC3</version>
1111
</parent>
1212
<packaging>pom</packaging>
1313

@@ -21,7 +21,7 @@
2121
</scm>
2222

2323
<properties>
24-
<scalecube-commons.version>1.0.4</scalecube-commons.version>
24+
<scalecube-commons.version>1.0.6</scalecube-commons.version>
2525
<slf4j.version>1.7.30</slf4j.version>
2626
<log4j.version>2.13.2</log4j.version>
2727
<reactor.version>Dysprosium-SR8</reactor.version>

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ public static Mono<Transport> bind() {
133133
* @return promise for bind operation
134134
*/
135135
public static Mono<Transport> bind(TransportConfig config) {
136-
TransportFactory transportFactory =
137-
Optional.ofNullable(config.transportFactory())
138-
.or(() -> Optional.ofNullable(TransportFactory.INSTANCE))
139-
.orElse(new TcpTransportFactory());
140-
return transportFactory.createTransport(config).start();
136+
return Optional.ofNullable(
137+
Optional.ofNullable(config.transportFactory()).orElse(TransportFactory.INSTANCE))
138+
.orElse(new TcpTransportFactory())
139+
.createTransport(config)
140+
.start();
141141
}
142142

143143
/**

0 commit comments

Comments
 (0)