Call NGCPXAvp:new from load even if result is empty

ngcp/dp.lua

@@ -39,10 +39,10 @@ NGCPDomainPrefs_MT = { __index = NGCPDomainPrefs }
                 table.insert(keys, row.attribute)
                 row = cur:fetch({}, "a")
             end
-            xavp = NGCPXAvp:new(level,'domain',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))
         end
+        xavp = NGCPXAvp:new(level,'domain',result)
         cur:close()
         con:close()
         return keys

ngcp/pp.lua

@@ -35,10 +35,10 @@ NGCPPeerPrefs_MT = { __index = NGCPPeerPrefs }
                 table.insert(result, row)
                 row = cur:fetch({}, "a")
             end
-            self.xavp = NGCPXAvp:new(level,'peer',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))
         end
+        self.xavp = NGCPXAvp:new(level,'peer',result)
         cur:close()
         con:close()
     end

ngcp/up.lua

@@ -39,10 +39,10 @@ NGCPUserPrefs_MT = { __index = NGCPUserPrefs }
                 table.insert(keys, row.attribute)
                 row = cur:fetch({}, "a")
             end
-            xavp = NGCPXAvp:new(level,'user',result)
         else
             sr.log("dbg", string.format("no results for query:%s", query))
         end
+        xavp = NGCPXAvp:new(level,'user',result)
         cur:close()
         con:close()
         return keys