Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/GlobalVariables/GlobalVariablesEachApp.groovy b/GlobalVariables/GlobalVariablesEachApp.groovy
index ae8b936042f5259750bbfa5c5f9791853bec2a30..ba78f9878f871119351c606ab7aa0d9d88446577 100644 (file)
--- a/GlobalVariables/GlobalVariablesEachApp.groovy
+++ b/GlobalVariables/GlobalVariablesEachApp.groovy
@@ -3,11 +3,11 @@ def state = [home:[],away:[],night:[]]
 //Create a global logger object for methods
 def log = new Logger()
 //Create a global variable for Functions in Subscribe method
-def functionList = []
+def functionList = new ArrayList(20)
 //Create a global variable for Objects in Subscribe method
-def objectList = []
+def objectList = new ArrayList(20)
 //Create a global variable for Events in Subscribe method
-def eventList = []
+def eventList = new ArrayList(20)
 //Create a global variable for settings
 def settings
 //Zip code

diff --git a/Lock/Locks.groovy b/Lock/Locks.groovy
index 8b73dc55ac20e393cd311655c2ddd4f03a2859c9..626b2448690854c9228f8f79e3221100bef18afa 100644 (file)
--- a/Lock/Locks.groovy
+++ b/Lock/Locks.groovy
@@ -28,10 +28,12 @@ public class Locks{
                def init = Verify.getBoolean()
                if (init) {
                        this.lockState = "locked"
-                       this.lockLatestValue = "locked"
+                        this.currentLock = "locked"
+                        this.lockLatestValue = "locked"
                } else {
                        this.lockState = "unlocked"
-                       this.lockLatestValue = "unlocked"
+                        this.currentLock = "unlocked"
+                        this.lockLatestValue = "unlocked"
                }
                locks.add(new Lock(sendEvent,id, label, displayName, this.lockState, this.lockLatestValue))
        }