Skip to content

Commit

Permalink
migrates from deprecated api, updates dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Oleh Dokuka <odokuka@vmware.com>
Signed-off-by: Oleh Dokuka <oleh.dokuka@icloud.com>
  • Loading branch information
Oleh Dokuka authored and OlegDokuka committed Mar 24, 2022
1 parent 37fc68c commit 6e4bf71
Show file tree
Hide file tree
Showing 8 changed files with 336 additions and 54 deletions.
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
id 'me.champeau.jmh' version '0.6.6' apply false
id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
id 'io.morethan.jmhreport' version '0.9.0' apply false
id 'io.github.reyerizo.gradle.jcstress' version '0.8.11' apply false
id 'io.github.reyerizo.gradle.jcstress' version '0.8.13' apply false
id 'com.github.vlsi.gradle-extensions' version '1.76' apply false
}

Expand All @@ -33,19 +33,19 @@ subprojects {
apply plugin: 'com.github.sherter.google-java-format'
apply plugin: 'com.github.vlsi.gradle-extensions'

ext['reactor-bom.version'] = '2020.0.12'
ext['logback.version'] = '1.2.3'
ext['netty-bom.version'] = '4.1.70.Final'
ext['netty-boringssl.version'] = '2.0.45.Final'
ext['reactor-bom.version'] = '2020.0.17'
ext['logback.version'] = '1.2.10'
ext['netty-bom.version'] = '4.1.75.Final'
ext['netty-boringssl.version'] = '2.0.51.Final'
ext['hdrhistogram.version'] = '2.1.12'
ext['mockito.version'] = '3.12.4'
ext['slf4j.version'] = '1.7.30'
ext['slf4j.version'] = '1.7.36'
ext['jmh.version'] = '1.33'
ext['junit.version'] = '5.8.1'
ext['micrometer.version'] = '1.7.5'
ext['assertj.version'] = '3.21.0'
ext['micrometer.version'] = '1.8.4'
ext['assertj.version'] = '3.22.0'
ext['netflix.limits.version'] = '0.3.6'
ext['bouncycastle-bcpkix.version'] = '1.68'
ext['bouncycastle-bcpkix.version'] = '1.70'
ext['awaitility.version'] = '4.1.1'

group = "io.rsocket"
Expand Down
5 changes: 3 additions & 2 deletions rsocket-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2018 the original author or authors.
* Copyright 2015-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -42,11 +42,12 @@ dependencies {

jcstressImplementation(project(":rsocket-test"))
jcstressImplementation "ch.qos.logback:logback-classic"
jcstressImplementation 'io.projectreactor:reactor-test'
}

jcstress {
mode = 'quick' //quick, default, tough
jcstressDependency = "org.openjdk.jcstress:jcstress-core:0.7"
jcstressDependency = "org.openjdk.jcstress:jcstress-core:0.15"
}

jar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,11 @@ public void onError(Throwable throwable) {
} else {
GUARD.compareAndSet(this, Operation.ON_ERROR, null);
}

if (done) {
throw new IllegalStateException("Already done");
}

error = throwable;
done = true;
q.offer(throwable);
Expand All @@ -241,6 +246,10 @@ public void onComplete() {
} else {
GUARD.compareAndSet(this, Operation.ON_COMPLETE, null);
}
if (done) {
throw new IllegalStateException("Already done");
}

done = true;
ON_COMPLETE_CALLS.incrementAndGet(this);

Expand Down
Loading

0 comments on commit 6e4bf71

Please sign in to comment.