Changes in 8018810: bug6060: single point of exit pattern in SailingServiceImpl.getBrandAffiliationWithSailing

				java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
			
          @@ -6119,20 +6119,23 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet

               public String getBrandAffiliationWithSailing(String locale) {

                   Optional<String> optLocale = Optional.ofNullable(locale).filter(s -> !s.isEmpty() && !"default".equalsIgnoreCase(s));

          +        String result;

                   if (brandingConfigurationServiceTracker == null) {

          -            return "";

          -        }

          -        BrandingConfigurationService brandingConfigurationService;

          -        try {

          -            brandingConfigurationService = brandingConfigurationServiceTracker.waitForService(0);

          -        } catch (InterruptedException e) {

          -            return "";

          -        }

          -        BrandingConfiguration configuration = brandingConfigurationService.getActiveBrandingConfiguration();

          -        if (configuration == null) {

          -            return "";

          +            result = "";

                   } else {

          -            return configuration.getInSailingContent(optLocale);

          +            BrandingConfigurationService brandingConfigurationService;

          +            try {

          +                brandingConfigurationService = brandingConfigurationServiceTracker.waitForService(0);

          +                BrandingConfiguration configuration = brandingConfigurationService.getActiveBrandingConfiguration();

          +                if (configuration == null) {

          +                    result = "";

          +                } else {

          +                    result = configuration.getInSailingContent(optLocale);

          +                }

          +            } catch (InterruptedException e) {

          +                result = "";

          +            }

                   }

          +        return result;

               }

           }

...	...	@@ -6119,20 +6119,23 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
6119	6119
6120	6120	public String getBrandAffiliationWithSailing(String locale) {
6121	6121	Optional<String> optLocale = Optional.ofNullable(locale).filter(s -> !s.isEmpty() && !"default".equalsIgnoreCase(s));
	6122	+ String result;
6122	6123	if (brandingConfigurationServiceTracker == null) {
6123		- return "";
6124		- }
6125		- BrandingConfigurationService brandingConfigurationService;
6126		- try {
6127		- brandingConfigurationService = brandingConfigurationServiceTracker.waitForService(0);
6128		- } catch (InterruptedException e) {
6129		- return "";
6130		- }
6131		- BrandingConfiguration configuration = brandingConfigurationService.getActiveBrandingConfiguration();
6132		- if (configuration == null) {
6133		- return "";
	6124	+ result = "";
6134	6125	} else {
6135		- return configuration.getInSailingContent(optLocale);
	6126	+ BrandingConfigurationService brandingConfigurationService;
	6127	+ try {
	6128	+ brandingConfigurationService = brandingConfigurationServiceTracker.waitForService(0);
	6129	+ BrandingConfiguration configuration = brandingConfigurationService.getActiveBrandingConfiguration();
	6130	+ if (configuration == null) {
	6131	+ result = "";
	6132	+ } else {
	6133	+ result = configuration.getInSailingContent(optLocale);
	6134	+ }
	6135	+ } catch (InterruptedException e) {
	6136	+ result = "";
	6137	+ }
6136	6138	}
	6139	+ return result;
6137	6140	}
6138	6141	}