Fix not to raise an exception from `(Service|Client)RequestContext.cu…

core/src/main/java/com/linecorp/armeria/client/ClientRequestContext.java

@@ -73,17 +73,14 @@ static ClientRequestContext current() {
      * Returns the client-side context of the {@link Request} that is being handled in the current thread.
      *
      * @return the {@link ClientRequestContext} available in the current thread, or {@code null} if unavailable.
-     * @throws IllegalStateException if the current context is not a {@link ClientRequestContext}.
      */
     @Nullable
     static ClientRequestContext currentOrNull() {
         final RequestContext ctx = RequestContext.currentOrNull();
-        if (ctx == null) {
-            return null;
+        if (ctx instanceof ClientRequestContext) {
+            return (ClientRequestContext) ctx;
         }
-        checkState(ctx instanceof ClientRequestContext,
-                   "The current context is not a client-side context: %s", ctx);
-        return (ClientRequestContext) ctx;
+        return null;
     }
 
     /**
@@ -104,6 +101,12 @@ static <T> T mapCurrent(
             return mapper.apply(ctx);
         }
 
+        final ServiceRequestContext serviceRequestContext = ServiceRequestContext.currentOrNull();
+        if (serviceRequestContext != null) {
+            throw new IllegalStateException("The current context is not a client-side context: " +
+                                            serviceRequestContext);
+        }
+
         if (defaultValueSupplier != null) {
             return defaultValueSupplier.get();
         }

core/src/main/java/com/linecorp/armeria/server/ServiceRequestContext.java

@@ -90,14 +90,7 @@ static ServiceRequestContext currentOrNull() {
             return null;
         }
 
-        final ServiceRequestContext root = ctx.root();
-        if (root != null) {
-            return root;
-        }
-
-        throw new IllegalStateException(
-                "The current context is not a server-side context and does not have a root " +
-                "which means that the context is not invoked by a server request. ctx: " + ctx);
+        return ctx.root();
     }
 
     /**
@@ -118,6 +111,14 @@ static <T> T mapCurrent(
             return mapper.apply(ctx);
         }
 
+        final ClientRequestContext clientRequestContext = ClientRequestContext.currentOrNull();
+        if (clientRequestContext != null) {
+            throw new IllegalStateException(
+                    "The current context is not a server-side context and does not have a root " +
+                    "which means that the context is not invoked by a server request. ctx: " +
+                    clientRequestContext);
+        }
+
         if (defaultValueSupplier != null) {
             return defaultValueSupplier.get();
         }

core/src/test/java/com/linecorp/armeria/client/ClientRequestContextTest.java

@@ -62,9 +62,7 @@ void currentOrNull() {
         assertCurrentCtx(null);
 
         try (SafeCloseable unused = serviceRequestContext().push()) {
-            assertThatThrownBy(ClientRequestContext::currentOrNull)
-                    .isInstanceOf(IllegalStateException.class)
-                    .hasMessageContaining("not a client-side context");
+            assertThat(ClientRequestContext.currentOrNull()).isNull();
         }
     }
 

core/src/test/java/com/linecorp/armeria/server/ServiceRequestContextTest.java

@@ -75,9 +75,7 @@ void currentOrNull() {
         assertCurrentCtx(null);
 
         try (SafeCloseable unused = clientRequestContext().push()) {
-            assertThatThrownBy(ServiceRequestContext::currentOrNull)
-                    .isInstanceOf(IllegalStateException.class)
-                    .hasMessageContaining("not a server-side context");
+            assertThat(ServiceRequestContext.currentOrNull()).isNull();
         }
     }