Skip to content

Commit da6ad3f

Browse files
authored
Merge pull request #336 from twilio/allow-non-paging
Check for null values in paging data
2 parents 4d40883 + b9fb9ed commit da6ad3f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/Twilio/Base/Page.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,19 @@ record => JsonConvert.DeserializeObject<T>(record.ToString())
142142
var uriNode = root["uri"];
143143
if (uriNode != null)
144144
{
145+
JToken pageSize;
146+
JToken firstPageUri;
147+
JToken nextPageUri;
148+
JToken previousPageUri;
149+
145150
// v2010 API
146151
return new Page<T>(
147152
parsedRecords,
148-
root["page_size"].Value<int>(),
153+
root.TryGetValue("page_size", out pageSize) ? root["page_size"].Value<int>() : parsedRecords.Count,
149154
uri: uriNode.Value<string>(),
150-
firstPageUri: root["first_page_uri"].Value<string>(),
151-
nextPageUri: root["next_page_uri"].Value<string>(),
152-
previousPageUri: root["previous_page_uri"].Value<string>()
155+
firstPageUri: root.TryGetValue("first_page_uri", out firstPageUri) ? root["first_page_uri"].Value<string>() : null,
156+
nextPageUri: root.TryGetValue("next_page_uri", out nextPageUri) ? root["next_page_uri"].Value<string>() : null,
157+
previousPageUri: root.TryGetValue("previous_page_uri", out previousPageUri) ? root["previous_page_uri"].Value<string>() : null
153158
);
154159
}
155160

0 commit comments

Comments
 (0)