Merge pull request #36888 from phillip-kruger/devui-router-fix

Fix dev-ui double contruction of Web Components
quarkusio · Nov 6, 2023 · 3602de6 · 3602de6
2 parents 5f70339 + 12839b7
commit 3602de6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/...ons/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js b/...ons/vertx-http/dev-ui-resources/src/main/resources/dev-ui/controller/router-controller.js
@@ -200,14 +200,10 @@ export class RouterController {
             }
         } else {
             // We know and already loaded the requested location
-            if (currentSelection === path) {
-                Router.go({pathname: path, search});
-                // The default naked route  
-            } else if (!RouterController.router.location.route && defaultRoute && currentSelection.endsWith('/dev-ui/')) {
+            if (!RouterController.router.location.route && defaultRoute && currentSelection.endsWith('/dev-ui/')) {
                 Router.go({pathname: path, search});
                 // We do not know and have not yet loaded the requested location
             } else if (!RouterController.router.location.route && defaultRoute) {
-
                 // pass original query param
                 const currentQueryString = window.location.search;
                 const origSearch = currentQueryString?.length > 0 ? '&' + currentQueryString : '';

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/MvnpmHandler.java
@@ -45,18 +45,20 @@ public void handle(RoutingContext event) {
 
         try {
             URL url = mvnpmLoader.getResource(BASE_DIR + fullPath);
-            URLConnection openConnection = url.openConnection();
-            long lastModified = openConnection.getLastModified();
-            try (InputStream is = openConnection.getInputStream()) {
-                if (is != null) {
-                    byte[] contents = is.readAllBytes();
-                    event.response()
-                            .putHeader(HttpHeaders.CONTENT_TYPE, getContentType(fileName))
-                            .putHeader(HttpHeaders.CACHE_CONTROL, "public, immutable, max-age=31536000")
-                            .putHeader(HttpHeaders.LAST_MODIFIED, formatDate(lastModified))
-                            .putHeader("date", formatDate(LocalDateTime.now()))
-                            .end(Buffer.buffer(contents));
-                    return;
+            if (url != null) {
+                URLConnection openConnection = url.openConnection();
+                long lastModified = openConnection.getLastModified();
+                try (InputStream is = openConnection.getInputStream()) {
+                    if (is != null) {
+                        byte[] contents = is.readAllBytes();
+                        event.response()
+                                .putHeader(HttpHeaders.CONTENT_TYPE, getContentType(fileName))
+                                .putHeader(HttpHeaders.CACHE_CONTROL, "public, immutable, max-age=31536000")
+                                .putHeader(HttpHeaders.LAST_MODIFIED, formatDate(lastModified))
+                                .putHeader("date", formatDate(LocalDateTime.now()))
+                                .end(Buffer.buffer(contents));
+                        return;
+                    }
                 }
             }
         } catch (IOException ex) {