Merge pull request #220 from mslehto/htable

modules/htable: improves error message when loading from database
kamailio · Jun 25, 2015 · afbcbfb · afbcbfb
2 parents 37e205c + f39736b
commit afbcbfb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c
@@ -197,11 +197,17 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode)
 	do {
 		for(i=0; i<RES_ROW_N(db_res); i++)
 		{
-			if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING
-					|| VAL_NULL(&RES_ROWS(db_res)[i].values[0])) {
-				LM_ERR("key type must be string and its value not null\n");
+			if(VAL_NULL(&RES_ROWS(db_res)[i].values[0])) {
+				LM_ERR("key value must not be null\n");
 				goto error;
 			}
+
+			if(RES_ROWS(db_res)[i].values[0].type!=DB1_STRING) {
+				LM_ERR("key type must be string (type=%d)\n",
+						RES_ROWS(db_res)[i].values[0].type);
+				goto error;
+			}
+
 			kname.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val);
 			if(kname.s==NULL) {
 				LM_ERR("null key in row %d\n", i);