From e6aab4229d0eca992be5767b72ac92f9f34907fd Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Fri, 26 Aug 2016 00:14:29 -0700
Subject: [PATCH] A few fixes

---
 lib/cwmp.coffee    |  2 +-
 lib/session.coffee | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/cwmp.coffee b/lib/cwmp.coffee
index 9ec30da..36b525c 100644
--- a/lib/cwmp.coffee
+++ b/lib/cwmp.coffee
@@ -196,7 +196,7 @@ applyPresets = (currentRequest) ->
 
       for k, v of parameters
         unpacked = device.unpack(currentRequest.sessionData.deviceData, v)
-        if unpacked[0] and (vv = deviceData.values.value.get(unpacked[0]))?
+        if unpacked[0] and (vv = currentRequest.sessionData.deviceData.values.value.get(unpacked[0]))?
           parameters[k] = vv[0]
 
       if whiteList?
diff --git a/lib/session.coffee b/lib/session.coffee
index 6e49769..31ee95c 100644
--- a/lib/session.coffee
+++ b/lib/session.coffee
@@ -687,10 +687,10 @@ processDeclaration = (sessionData, path, _timestamps, values) ->
 
       if values?.value?
         if isObject == 0 and isWritable == 1
-          cur = setValues.setValues.get(sub)
+          cur = syncState.setValues.get(sub)
           if not cur?
             cur = [deviceData.values.value.get(sub), values.value]
-            setValues.setValues.set(sub, cur)
+            syncState.setValues.set(sub, cur)
           else
             cur[1] = values.value
         else
@@ -988,10 +988,13 @@ rpcResponse = (sessionData, id, rpcRes, callback) ->
         parameterList.push(
           [p[0]].concat(device.sanitizeParameterValue([rpcReq.instanceValues[p[0]], p[2]])))
 
-    sessionData.rpcRequest = {
-      type: 'SetParameterValues'
-      parameterList: parameterList
-    }
+    if not parameterList.length
+      sessionData.rpcRequest = null
+    else
+      sessionData.rpcRequest = {
+        type: 'SetParameterValues'
+        parameterList: parameterList
+      }
 
   timestamp = sessionData.timestamp
   revision = sessionData.revisions.reduce(((a, b) -> a + (b >> 1)), 0) + 1