falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pall...@apache.org
Subject falcon git commit: FALCON-1804 Non-SLA feed throws NullPointerException (By Sandeep Samudrala)
Date Fri, 05 Feb 2016 12:14:19 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.9 00f6b0be7 -> 36f0dc7e7


FALCON-1804 Non-SLA feed throws NullPointerException (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/36f0dc7e
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/36f0dc7e
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/36f0dc7e

Branch: refs/heads/0.9
Commit: 36f0dc7e7fe49cd54138b6921fad57648ce6aeca
Parents: 00f6b0b
Author: Pallavi Rao <pallavi.rao@inmobi.com>
Authored: Fri Feb 5 17:44:05 2016 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Fri Feb 5 17:44:05 2016 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                      | 2 ++
 .../java/org/apache/falcon/service/FeedSLAMonitoringService.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/36f0dc7e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 465bc9d..c870e4a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -110,6 +110,8 @@ Release Version: 0.9
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1804 Non-SLA feed throws NullPointerException (Sandeep Samudrala via Pallavi Rao)
+
     FALCON-1782 Client returns FalconWebException instead of the expected error message(Praveen
Adlakha via Ajay Yadava)
 
     FALCON-1747 Falcon instance status listing is throwing error message (Peeyush Bishnoi)

http://git-wip-us.apache.org/repos/asf/falcon/blob/36f0dc7e/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
index b720c77..2b76876 100644
--- a/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
+++ b/prism/src/main/java/org/apache/falcon/service/FeedSLAMonitoringService.java
@@ -270,7 +270,9 @@ public final class FeedSLAMonitoringService implements ConfigurationChangeListen
         LOG.info("Removing {} feed's instance {} in cluster {} from pendingSLA", feedName,
                 clusterName, nominalTime);
         Pair<String, String> feedCluster = new Pair<>(feedName, clusterName);
-        pendingInstances.get(feedCluster).remove(nominalTime);
+        if (pendingInstances.get(feedCluster) != null) {
+            pendingInstances.get(feedCluster).remove(nominalTime);
+        }
     }
 
     private FileSystem initializeFileSystem() {


Mime
View raw message