Repository: falcon Updated Branches: refs/heads/master f66b0b9f1 -> f2e546268
FALCON-1047 Feed Instance Listing doesn't return any output or error. Contributed by Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f2e54626 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f2e54626 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f2e54626 Branch: refs/heads/master Commit: f2e54626832598b107926d827c33f0541a6c84ad Parents: f66b0b9 Author: Suhas Vasu <[email protected]> Authored: Tue Mar 3 17:07:51 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Tue Mar 3 17:07:51 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../falcon/resource/FeedInstanceResult.java | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f2e54626/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f79bd8c..ebf4391 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -89,6 +89,9 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1047 Feed Instance Listing doesn't return any output or error + (Pallavi Rao via Suhas Vasu) + FALCON-1050 Falcon rerun is broken for timed out instances (Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/f2e54626/client/src/main/java/org/apache/falcon/resource/FeedInstanceResult.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/resource/FeedInstanceResult.java b/client/src/main/java/org/apache/falcon/resource/FeedInstanceResult.java index 1d55e68..dc64976 100644 --- a/client/src/main/java/org/apache/falcon/resource/FeedInstanceResult.java +++ b/client/src/main/java/org/apache/falcon/resource/FeedInstanceResult.java @@ -58,6 +58,24 @@ public class FeedInstanceResult extends APIResult { this.instances = instances; } + @Override + public Object[] getCollection() { + return getInstances(); + } + + @Override + public void setCollection(Object[] items) { + if (items == null) { + setInstances(new Instance[0]); + } else { + Instance[] newInstances = new Instance[items.length]; + for (int index = 0; index < items.length; index++) { + newInstances[index] = (Instance)items[index]; + } + setInstances(newInstances); + } + } + /** * A single instance object inside instance result. */
