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-1421 checkColos should be a no-op for embedded mode. Contributed by Venkat Ranganathan.
Date Fri, 04 Sep 2015 10:10:51 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 916e30ff3 -> 5ae9f314e


FALCON-1421 checkColos should be a no-op for embedded mode. Contributed by Venkat Ranganathan.


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

Branch: refs/heads/master
Commit: f0cdb34a3fb7274490df17341a3b3c5c386f5fbe
Parents: 916e30f
Author: Ajay Yadava <ajaynsit@gmail.com>
Authored: Fri Sep 4 15:12:40 2015 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Fri Sep 4 15:12:40 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/falcon/blob/f0cdb34a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45674b3..c5b775d 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ Trunk (Unreleased)
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1421 checkColos should be a no-op for embedded mode(Venkat Ranganathan via Ajay
Yadava)
 
   
 Branch: 0.7 (Proposed Release Version: 0.7)

http://git-wip-us.apache.org/repos/asf/falcon/blob/f0cdb34a/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 78964dd..9700baa 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -101,6 +101,9 @@ public abstract class AbstractEntityManager {
     }
 
     protected void checkColo(String colo) {
+        if (DeploymentUtil.isEmbeddedMode()) {
+            return;
+        }
         if (StringUtils.isNotEmpty(colo) && !colo.equals("*")) {
             if (!DeploymentUtil.getCurrentColo().equals(colo)) {
                 throw FalconWebException.newException(


Mime
View raw message