Changing remote branch to PLRG Git server.

[smartapps.git] / official / the-big-switch.groovy

diff --git a/official/the-big-switch.groovy b/official/the-big-switch.groovy
index 4dd13595b538f4bdac1969b2d6d8ac72541284ac..e566e66b356eb0a0372eeab856b2496920c341b8 100755 (executable)
--- a/official/the-big-switch.groovy
+++ b/official/the-big-switch.groovy
@@ -66,13 +66,13 @@ def logHandler(evt) {
 def onHandler(evt) {
        log.debug evt.value
        log.debug onSwitches1()
-       onSwitches1()?.on()
+       onSwitches1()*.on()
 }
 
 def offHandler(evt) {
        log.debug evt.value
        log.debug offSwitches1()
-       offSwitches1()?.off()
+       offSwitches1()*.off()
 }
 
 def dimHandler(evt) {
@@ -81,13 +81,13 @@ def dimHandler(evt) {
 }
 
 private onSwitches1() {
-       if(switches && onSwitches) { switches + onSwitches }
-       else if(switches) { switches }
-       else { onSwitches }
+       if(switches && onSwitches) { (switches).findAll{it} + (onSwitches).findAll{it} }
+       else if(switches) { (switches).findAll{it} }
+       else { (onSwitches).findAll{it} }
 }
 
 private offSwitches1() {
-       if(switches && offSwitches) { switches + offSwitches }
-       else if(switches) { switches }
-       else { offSwitches }
+       if(switches && offSwitches) { (switches).findAll{it} + (offSwitches).findAll{it} }
+       else if(switches) { (switches).findAll{it} }
+       else { (offSwitches).findAll{it} }
 }