[felix-dev] branch master updated: FELIX-6621 : Regressions caused by FELIX-6607

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new a70fb8cbe3 FELIX-6621 : Regressions caused by FELIX-6607
a70fb8cbe3 is described below

commit a70fb8cbe3326969be2ba26f2eccf281a3f7a67e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sun Jul 30 19:08:08 2023 +0200

    FELIX-6621 : Regressions caused by FELIX-6607
---
 .../apache/felix/webconsole/internal/servlet/PluginHolder.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
index e428130f6e..e7bbc2599a 100644
--- 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
+++ 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/PluginHolder.java
@@ -415,17 +415,16 @@ class PluginHolder implements 
ServiceTrackerCustomizer<Servlet, Plugin> {
         protected AbstractWebConsolePlugin doGetConsolePlugin() {
             final Servlet service = getHolder().getBundleContext().getService( 
this.getServiceReference() );
             if ( service != null ) {
-                String title = null;
+                String title = getProperty( this.getServiceReference(), 
WebConsoleConstants.PLUGIN_TITLE );
                 final AbstractWebConsolePlugin servlet;
                 if ( service instanceof AbstractWebConsolePlugin ) {
                     servlet = ( AbstractWebConsolePlugin ) service;
-                    title = servlet.getTitle();
+                    if (title == null) {
+                        title = servlet.getTitle();
+                    }
                 } else {
                     servlet = new WebConsolePluginAdapter( getLabel(), 
service, this.getServiceReference() );
                 }
-                if (title == null) {
-                    title = getProperty( this.getServiceReference(), 
WebConsoleConstants.PLUGIN_TITLE );
-                }
                 this.setTitle(title);
 
                 return servlet;