falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject [1/2] falcon git commit: FALCON-1380 Triage Result throws incorrect error message on prism for an invalid process instance. Contributed by Ajay Yadava.
Date Mon, 10 Aug 2015 08:36:12 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 0582e6197 -> 459b0dd79


FALCON-1380 Triage Result throws incorrect error message on prism for an invalid process instance.
Contributed by Ajay Yadava.


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

Branch: refs/heads/master
Commit: ef3bdce4ea8e0047b57e394d402b0c05ba2b60d6
Parents: 0582e61
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Mon Aug 10 13:37:39 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Mon Aug 10 13:37:39 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                       | 3 +++
 client/src/main/java/org/apache/falcon/resource/TriageResult.java | 2 +-
 .../java/org/apache/falcon/resource/AbstractInstanceManager.java  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/ef3bdce4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6a0ccfb..eae8ecd 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@ Trunk (Unreleased)
     FALCON-796 Enable users to triage data processing issues through falcon (Ajay Yadava)
     
   IMPROVEMENTS
+
     FALCON-1359 Improve output format for Feed Instance Listing(Ajay Yadava)
 
     FALCON-1368 Improve Falcon server restart time(Sandeep Samudrala via Ajay Yadava)
@@ -83,6 +84,8 @@ Trunk (Unreleased)
     (Suhas Vasu)
 
   BUG FIXES
+    FALCON-1380 Triage Result throws incorrect error message on prism for an invalid process
instance(Ajay Yadava)
+
     FALCON-1310 Falcon build fails with Oozie-4.2.0(Peeyush Bishnoi via Sowmya Ramesh)
 
     FALCON-1369 Trunk build is broken(Ajay Yadava via Sowmya Ramesh)

http://git-wip-us.apache.org/repos/asf/falcon/blob/ef3bdce4/client/src/main/java/org/apache/falcon/resource/TriageResult.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/resource/TriageResult.java b/client/src/main/java/org/apache/falcon/resource/TriageResult.java
index a5ffe74..131e2e1 100644
--- a/client/src/main/java/org/apache/falcon/resource/TriageResult.java
+++ b/client/src/main/java/org/apache/falcon/resource/TriageResult.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 /**
  * Resut for instance triage.
  */
-@XmlRootElement(name = "result")
+@XmlRootElement(name = "triage")
 @XmlAccessorType(XmlAccessType.FIELD)
 @edu.umd.cs.findbugs.annotations.SuppressWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 public class TriageResult extends APIResult {

http://git-wip-us.apache.org/repos/asf/falcon/blob/ef3bdce4/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
index af0b0f6..b382f95 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
@@ -662,7 +662,7 @@ public abstract class AbstractInstanceManager extends AbstractEntityManager
{
             throw FalconWebException.newTriageResultException(e, Response.Status.BAD_REQUEST);
         } catch (Throwable e) {
             LOG.error("Failed to triage", e);
-            throw FalconWebException.newTriageResultException(e, Response.Status.INTERNAL_SERVER_ERROR);
+            throw FalconWebException.newTriageResultException(e, Response.Status.BAD_REQUEST);
         }
     }
 


Mime
View raw message