From d00c4002764422c2864e371a49e3b062652befbd Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 26 Aug 2015 18:18:10 +0300 Subject: [PATCH] use usage record pointer, fixes #164 --- apier/v1/auth.go | 4 ++-- utils/struct.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apier/v1/auth.go b/apier/v1/auth.go index 3c14dfaa6..fb7cb1374 100644 --- a/apier/v1/auth.go +++ b/apier/v1/auth.go @@ -28,11 +28,11 @@ import ( // Returns MaxUsage (for calls in seconds), -1 for no limit func (self *ApierV1) GetMaxUsage(usageRecord engine.UsageRecord, maxUsage *float64) error { - out, err := engine.LoadUserProfile(usageRecord, "") + out, err := engine.LoadUserProfile(&usageRecord, "") if err != nil { return err } - usageRecord = out.(engine.UsageRecord) + usageRecord = *(out.(*engine.UsageRecord)) if usageRecord.TOR == "" { usageRecord.TOR = utils.VOICE } diff --git a/utils/struct.go b/utils/struct.go index c59e574a6..06f298ab0 100644 --- a/utils/struct.go +++ b/utils/struct.go @@ -160,7 +160,7 @@ func FromMapStringString(m map[string]string, in interface{}) { field := v.FieldByName(fieldName) if field.IsValid() { if field.Kind() == reflect.String { - if v.FieldByName(fieldName).String() != "" { + if field.String() != "" && field.CanSet() { field.SetString(fieldValue) } }