Skip to content

Commit ff5f88f

Browse files
committed
Remove context push in RequestContextScala*.call()
1 parent 234203e commit ff5f88f

9 files changed

+9
-27
lines changed

rxjava/src/main/java/com/linecorp/armeria/common/rxjava/RequestContextScalarSupplierFlowable.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ protected void subscribeActual(Subscriber<? super T> s) {
5252
@SuppressWarnings("unchecked")
5353
@Override
5454
public T get() {
55-
try (SafeCloseable ignored = assemblyContext.push()) {
56-
return ((ScalarSupplier<T>) source).get();
57-
}
55+
return ((ScalarSupplier<T>) source).get();
5856
}
5957
}

rxjava/src/main/java/com/linecorp/armeria/common/rxjava/RequestContextScalarSupplierMaybe.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(MaybeObserver<? super T> s) {
4444
@Override
4545
@SuppressWarnings("unchecked")
4646
public T get() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarSupplier<T>) source).get();
49-
}
47+
return ((ScalarSupplier<T>) source).get();
5048
}
5149
}

rxjava/src/main/java/com/linecorp/armeria/common/rxjava/RequestContextScalarSupplierObservable.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(Observer<? super T> s) {
4444
@SuppressWarnings("unchecked")
4545
@Override
4646
public T get() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarSupplier<T>) source).get();
49-
}
47+
return ((ScalarSupplier<T>) source).get();
5048
}
5149
}

rxjava/src/main/java/com/linecorp/armeria/common/rxjava/RequestContextScalarSupplierSingle.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(SingleObserver<? super T> s) {
4444
@SuppressWarnings("unchecked")
4545
@Override
4646
public T get() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarSupplier<T>) source).get();
49-
}
47+
return ((ScalarSupplier<T>) source).get();
5048
}
5149
}

rxjava2/src/main/java/com/linecorp/armeria/common/rxjava2/RequestContextScalarCallableCompletable.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ protected void subscribeActual(CompletableObserver s) {
4545
@SuppressWarnings("unchecked")
4646
@Override
4747
public T call() {
48-
try (SafeCloseable ignored = assemblyContext.push()) {
49-
return ((ScalarCallable<T>) source).call();
50-
}
48+
return ((ScalarCallable<T>) source).call();
5149
}
5250
}

rxjava2/src/main/java/com/linecorp/armeria/common/rxjava2/RequestContextScalarCallableFlowable.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ protected void subscribeActual(Subscriber<? super T> s) {
5353
@SuppressWarnings("unchecked")
5454
@Override
5555
public T call() {
56-
try (SafeCloseable ignored = assemblyContext.push()) {
57-
return ((ScalarCallable<T>) source).call();
58-
}
56+
return ((ScalarCallable<T>) source).call();
5957
}
6058
}

rxjava2/src/main/java/com/linecorp/armeria/common/rxjava2/RequestContextScalarCallableMaybe.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(MaybeObserver<? super T> s) {
4444
@SuppressWarnings("unchecked")
4545
@Override
4646
public T call() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarCallable<T>) source).call();
49-
}
47+
return ((ScalarCallable<T>) source).call();
5048
}
5149
}

rxjava2/src/main/java/com/linecorp/armeria/common/rxjava2/RequestContextScalarCallableObservable.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(Observer<? super T> s) {
4444
@SuppressWarnings("unchecked")
4545
@Override
4646
public T call() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarCallable<T>) source).call();
49-
}
47+
return ((ScalarCallable<T>) source).call();
5048
}
5149
}

rxjava2/src/main/java/com/linecorp/armeria/common/rxjava2/RequestContextScalarCallableSingle.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ protected void subscribeActual(SingleObserver<? super T> s) {
4444
@SuppressWarnings("unchecked")
4545
@Override
4646
public T call() {
47-
try (SafeCloseable ignored = assemblyContext.push()) {
48-
return ((ScalarCallable<T>) source).call();
49-
}
47+
return ((ScalarCallable<T>) source).call();
5048
}
5149
}

0 commit comments

Comments
 (0)