falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajayyad...@apache.org
Subject falcon git commit: FALCON-1362 Colo option shouldn't be mandatory. Contributed by Sandeep Samudrala.
Date Thu, 06 Aug 2015 07:15:42 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 0bc2ed11d -> 57195fa05


FALCON-1362 Colo option shouldn't be mandatory. Contributed by Sandeep Samudrala.


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

Branch: refs/heads/master
Commit: 57195fa052a48be468ff7670c0fd4878aa7e34d2
Parents: 0bc2ed1
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Thu Aug 6 12:07:44 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Thu Aug 6 12:07:44 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                               |  2 ++
 .../org/apache/falcon/resource/AbstractEntityManager.java | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/57195fa0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 23c9970..45a3fbb 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ Trunk (Unreleased)
     FALCON-796 Enable users to triage data processing issues through falcon (Ajay Yadava)
     
   IMPROVEMENTS
+    FALCON-1362 Colo option shouldn't be mandatory(Sandeep Samudrala via Ajay Yadava)
+
     FALCON-1360 Size of feed should be humanized in feed instance listing(Sndeep Samudrala
via Ajay Yadava)
 
     FALCON-1301 Improve documentation for Installation(Pragya Mittal via Ajay Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/57195fa0/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
index 478088d..43461c8 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -116,10 +116,12 @@ public abstract class AbstractEntityManager {
     }
 
     protected void checkColo(String colo) {
-        if (!DeploymentUtil.getCurrentColo().equals(colo)) {
-            throw FalconWebException.newException(
-                    "Current colo (" + DeploymentUtil.getCurrentColo() + ") is not " + colo,
-                    Response.Status.BAD_REQUEST);
+        if (StringUtils.isNotEmpty(colo) && !colo.equals("*")) {
+            if (!DeploymentUtil.getCurrentColo().equals(colo)) {
+                throw FalconWebException.newException(
+                        "Current colo (" + DeploymentUtil.getCurrentColo() + ") is not "
+ colo,
+                        Response.Status.BAD_REQUEST);
+            }
         }
     }
 


Mime
View raw message