diff --git a/packages/hawtio/src/plugins/camel/icons/Icons.tsx b/packages/hawtio/src/plugins/camel/icons/Icons.tsx index eb1b5ba6..121213d1 100644 --- a/packages/hawtio/src/plugins/camel/icons/Icons.tsx +++ b/packages/hawtio/src/plugins/camel/icons/Icons.tsx @@ -50,5 +50,5 @@ export function getIcon(name: string, size?: number): JSX.Element { } } - return element ? element : elementMap.get(IconNames.GenericIcon) ?? svg.generic + return element ? element : (elementMap.get(IconNames.GenericIcon) ?? svg.generic) } diff --git a/packages/hawtio/src/plugins/camel/routes-service.ts b/packages/hawtio/src/plugins/camel/routes-service.ts index dea5f675..923bd634 100644 --- a/packages/hawtio/src/plugins/camel/routes-service.ts +++ b/packages/hawtio/src/plugins/camel/routes-service.ts @@ -217,7 +217,7 @@ class RoutesService { const mbeanName = routesNode.getMetadata(contextNodeType) const operationForMBean = mbeanName ? routesFolderOperation : routeNodeOperation - const mbeanToQuery = mbeanName ? mbeanName : routesNode.objectName ?? '' + const mbeanToQuery = mbeanName ? mbeanName : (routesNode.objectName ?? '') try { xml = await jolokiaService.execute(mbeanToQuery, operationForMBean, [true, true]) diff --git a/packages/hawtio/src/plugins/springboot/springboot-service.ts b/packages/hawtio/src/plugins/springboot/springboot-service.ts index 28e75628..087c0ddc 100644 --- a/packages/hawtio/src/plugins/springboot/springboot-service.ts +++ b/packages/hawtio/src/plugins/springboot/springboot-service.ts @@ -132,7 +132,7 @@ class SpringBootService { jmxTraces .filter(trace => { - const path = trace.info ? trace.info.path : trace.request?.uri ?? '' + const path = trace.info ? trace.info.path : (trace.request?.uri ?? '') // Avoid including our own jolokia requests in the results return /.*?\/jolokia\/?(?:\/.*(?=$))?$/.test(path) === false })