Repository: olingo-odata4 Updated Branches: refs/heads/master e9b71f34b -> 67ba360b7
Fixing build with JDK 6 Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/67ba360b Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/67ba360b Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/67ba360b Branch: refs/heads/master Commit: 67ba360b7f2882e0fb91824b1b7f868131db2795 Parents: e9b71f3 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Apr 11 14:38:34 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Apr 11 14:38:34 2014 +0200 ---------------------------------------------------------------------- fit/src/main/java/org/apache/olingo/fit/AbstractServices.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/67ba360b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index 3f445db..0c9a7f4 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -663,7 +663,7 @@ public abstract class AbstractServices { final FITAtomDeserializer atomDeserializer = Commons.getAtomDeserializer(version); final AtomSerializer atomSerializer = Commons.getAtomSerializer(version); - final Container<Feed> container = atomDeserializer.read(feed, AtomFeedImpl.class); + final Container<AtomFeedImpl> container = atomDeserializer.read(feed, AtomFeedImpl.class); setInlineCount(container.getObject(), count); @@ -679,7 +679,7 @@ public abstract class AbstractServices { mapper.writeValue( writer, new JsonFeedContainer<JSONFeedImpl>(container.getContextURL(), container.getMetadataETag(), - (new DataBinder(version)).getJsonFeed((AtomFeedImpl) container.getObject()))); + new DataBinder(version).getJsonFeed(container.getObject()))); } return xml.createResponse(new ByteArrayInputStream(content.toByteArray()),
