Merge pull request #378 from muff1nman/fix-377

Dont mix ws and normal HttpServletRequest retrieval methods

libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java

@@ -19,6 +19,7 @@
 package org.libresonic.player.controller;
 
 import org.apache.commons.lang.StringUtils;
+import org.libresonic.player.service.NetworkService;
 import org.libresonic.player.service.SettingsService;
 import org.libresonic.player.service.SonosService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +81,8 @@ public class SonosSettingsController {
         settingsService.setSonosServiceName(sonosServiceName);
         settingsService.save();
 
-        sonosService.setMusicServiceEnabled(false);
-        sonosService.setMusicServiceEnabled(sonosEnabled);
+        sonosService.setMusicServiceEnabled(false, NetworkService.getBaseUrl(request));
+        sonosService.setMusicServiceEnabled(sonosEnabled, NetworkService.getBaseUrl(request));
     }
 
     public void setSettingsService(SettingsService settingsService) {

libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java

@@ -106,7 +106,7 @@ public class SonosService implements SonosSoap {
     @Resource
     private WebServiceContext context;
 
-    public void setMusicServiceEnabled(boolean enabled) {
+    public void setMusicServiceEnabled(boolean enabled, String baseUrl) {
         List<String> sonosControllers = upnpService.getSonosControllerHosts();
         if (sonosControllers.isEmpty()) {
             LOG.info("No Sonos controller found");
@@ -116,11 +116,10 @@ public class SonosService implements SonosSoap {
 
         String sonosServiceName = settingsService.getSonosServiceName();
         int sonosServiceId = settingsService.getSonosServiceId();
-        String libresonicBaseUrl = NetworkService.getBaseUrl(getRequest());
 
         for (String sonosController : sonosControllers) {
             try {
-                new SonosServiceRegistration().setEnabled(libresonicBaseUrl, sonosController, enabled,
+                new SonosServiceRegistration().setEnabled(baseUrl, sonosController, enabled,
                                                           sonosServiceName, sonosServiceId);
                 break;
             } catch (IOException x) {