falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaikid...@apache.org
Subject git commit: FALCON-323 Summary API deserialization fails if array has only one element. Contributed by Shwetha GS.
Date Mon, 03 Mar 2014 19:01:41 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master bd2de46ff -> d57c71e6e


FALCON-323 Summary API deserialization fails if array has only one element. Contributed by
Shwetha GS.


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/d57c71e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/d57c71e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/d57c71e6

Branch: refs/heads/master
Commit: d57c71e6e23a4de221f2e01a4021005f51564fae
Parents: bd2de46
Author: shaikidris <psychidris@gmail.com>
Authored: Tue Mar 4 00:30:37 2014 +0530
Committer: shaikidris <psychidris@gmail.com>
Committed: Tue Mar 4 00:30:37 2014 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                   | 3 +++
 .../apache/falcon/resource/provider/JAXBContextResolver.java  | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/d57c71e6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c6b62d..fa9820c 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,6 +57,9 @@ Trunk (Unreleased)
     FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
 
   BUG FIXES
+    FALCON-323 Summary API deserialization fails if array has only one element.
+    (Shwetha GS via Shaik Idris)
+
     FALCON-319 Summary instance API returning wrong exception. (Shwetha GS via 
     Shaik Idris)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/d57c71e6/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java
b/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java
index a58eade..4469e02 100644
--- a/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java
+++ b/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java
@@ -22,6 +22,8 @@ import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.api.json.JSONJAXBContext;
 import org.apache.falcon.resource.APIResult;
 import org.apache.falcon.resource.InstancesResult;
+import org.apache.falcon.resource.InstancesSummaryResult;
+import org.apache.falcon.resource.InstancesSummaryResult.InstanceSummary;
 
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
@@ -42,7 +44,10 @@ public class JAXBContextResolver implements ContextResolver<JAXBContext>
{
         InstancesResult.class,
         APIResult.class,
         InstancesResult.Instance.class,
-        InstancesResult.WorkflowStatus.class, };
+        InstancesResult.WorkflowStatus.class,
+        InstancesSummaryResult.class,
+        InstanceSummary.class,
+    };
 
     static {
         try {


Mime
View raw message