Minor refactor in Http2ServerRequestImpl the error notification

eclipse-vertx · Mar 2, 2019 · 695ad8c · 695ad8c
1 parent 4bc9c35
commit 695ad8c
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/src/main/java/io/vertx/core/http/impl/Http2ServerRequestImpl.java b/src/main/java/io/vertx/core/http/impl/Http2ServerRequestImpl.java
@@ -110,24 +110,34 @@ void handleInterestedOpsChanged() {
 
   @Override
   void handleException(Throwable cause) {
+    boolean notify;
+    synchronized (conn) {
+      notify = !ended;
+    }
+    if (notify) {
+      notifyException(cause);
+    }
+    response.handleException(cause);
+  }
+
+  private void notifyException(Throwable failure) {
     Handler<Throwable> handler;
     synchronized (conn) {
-      handler = ended ? null : exceptionHandler;
+      handler = exceptionHandler;
     }
     if (handler != null) {
-      handler.handle(cause);
+      handler.handle(failure);
     }
-    response.handleException(cause);
   }
 
   @Override
   void handleClose() {
-    Handler<Throwable> handler;
+    boolean notify;
     synchronized (conn) {
-      handler = streamEnded ? null : exceptionHandler;
+      notify = !streamEnded;
     }
-    if (handler != null) {
+    if (notify) {
-      handler.handle(new ClosedChannelException());
+      notifyException(new ClosedChannelException());
     }
     response.handleClose();
   }
@@ -187,13 +197,13 @@ void handleEnd(MultiMap trailers) {
 
   @Override
   void handleReset(long errorCode) {
-    Handler<Throwable> handler;
+    boolean notify;
     synchronized (conn) {
-      handler = ended ? null : exceptionHandler;
+      notify = !ended;
       ended = true;
     }
-    if (handler != null) {
+    if (notify) {
-      handler.handle(new StreamResetException(errorCode));
+      notifyException(new StreamResetException(errorCode));
     }
     response.handleReset(errorCode);
   }