summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphleal@br.ibm.com2013-07-25 15:22:24 (EDT)
committer Samuel Padgett2013-07-25 15:22:24 (EDT)
commit0250045e739389f96b3460a4489055eade135295 (patch)
treeb9de153475aae49aea8c3bfe61ee5b0fb195f0a6
parent6ebd1eae5ae2cb23f7749a9a3bb067dd826bee50 (diff)
downloadorg.eclipse.lyo.core-0250045e739389f96b3460a4489055eade135295.zip
org.eclipse.lyo.core-0250045e739389f96b3460a4489055eade135295.tar.gz
org.eclipse.lyo.core-0250045e739389f96b3460a4489055eade135295.tar.bz2
Bug 413448: Adding the missing JsonHelper part of the fixrefs/changes/68/14868/3
Conflicts: org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java Change-Id: I9e3d70e1a0552b83e59ed02ddda43bb2348cf7ff Signed-off-by: phleal@br.ibm.com <phleal@br.ibm.com> Also-by: Samuel Padgett <spadgett@us.ibm.com>
-rw-r--r--org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java b/org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java
index f8ddce8..e669687 100644
--- a/org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java
+++ b/org.eclipse.lyo.oslc4j.provider.json4j/src/org/eclipse/lyo/oslc4j/provider/json4j/JsonHelper.java
@@ -218,14 +218,16 @@ public final class JsonHelper
if (responseInfo != null)
{
-
responseInfoJSONObject.put(oslcPrefix + JSON_PROPERTY_DELIMITER + JSON_PROPERTY_SUFFIX_TOTAL_COUNT,
responseInfo.totalCount() == null ? objects.length : responseInfo.totalCount());
if (responseInfo.nextPage() != null)
{
+ final JSONObject nextPageJSONObject = new JSONObject();
+ nextPageJSONObject.put(rdfPrefix + JSON_PROPERTY_DELIMITER + JSON_PROPERTY_SUFFIX_RESOURCE,
+ responseInfo.nextPage());
responseInfoJSONObject.put(oslcPrefix + JSON_PROPERTY_DELIMITER + JSON_PROPERTY_SUFFIX_NEXT_PAGE,
- responseInfo.nextPage());
+ nextPageJSONObject);
}
final JSONArray responseInfoTypesJSONArray = new JSONArray();