Dev UI - Reactive Messaging - fix NPE when a channel is not configured

- resolves quarkusio#15293 (cherry picked from commit eea49d4)
gsmet · Mar 1, 2021 · 5d896f6 · 5d896f6
1 parent 2134caf
commit 5d896f6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...tive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html b/...tive-messaging/deployment/src/main/resources/dev-templates/tags/componentDescription.html
@@ -1,3 +1,4 @@
+{#if it}
 {#when it.type}
   {#case PUBLISHER}
   <i class="fas fa-sign-out-alt"></i> Publisher:
@@ -12,4 +13,5 @@
   {#case CHANNEL}
   <i class="fas fa-syringe"></i> Channel:
 {/when}
-{it.description.raw}
+{it.description.raw}
+{/if}
diff --git a/...a/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfos.java b/...a/io/quarkus/smallrye/reactivemessaging/runtime/devconsole/DevReactiveMessagingInfos.java
@@ -121,7 +121,7 @@ public static class DevChannelInfo implements Comparable<DevChannelInfo> {
         public DevChannelInfo(String name, Component publisher, List<Component> consumers) {
             this.name = name;
             this.publisher = publisher;
-            this.consumers = consumers;
+            this.consumers = consumers != null ? consumers : Collections.emptyList();
         }
 
         public String getName() {
@@ -138,18 +138,26 @@ public List<Component> getConsumers() {
 
         @Override
         public int compareTo(DevChannelInfo other) {
-            // publisher connectors first
-            if (publisher.type != other.publisher.type) {
-                return publisher.type == ComponentType.CONNECTOR ? -1 : 1;
+            if (publisher != other.publisher) {
+                if (other.publisher == null) {
+                    return -1;
+                }
+                if (publisher == null) {
+                    return 1;
+                }
+                // publisher connectors first
+                if (publisher.type != other.publisher.type) {
+                    return publisher.type == ComponentType.CONNECTOR ? -1 : 1;
+                }
             }
             // consumer connectors last
             long consumerConnetors = consumers.stream().filter(Component::isConnector).count();
             long otherConsumersConnectors = other.consumers.stream().filter(Component::isConnector).count();
             if (consumerConnetors != otherConsumersConnectors) {
                 return Long.compare(otherConsumersConnectors, consumerConnetors);
             }
-
-            if (publisher.type == ComponentType.CONNECTOR && other.publisher.type != ComponentType.CONNECTOR) {
+            if (publisher != other.publisher && publisher.type == ComponentType.CONNECTOR
+                    && other.publisher.type != ComponentType.CONNECTOR) {
                 return 1;
             }
             // alphabetically