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-1804 Non-SLA feed throws NullPointerException
Date Fri, 05 Feb 2016 10:44:51 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 9cf3b7111 -> 943fc11d7


FALCON-1804 Non-SLA feed throws NullPointerException

Author: sandeep <sandysmdl@gmail.com>

Reviewers: Ajay Yadava <ajayyadava@apache.org>, Pavan Kumar Kolamuri, Praveen Adlakha

Closes #21 from sandeepSamudrala/FALCON-1721


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

Branch: refs/heads/master
Commit: 943fc11d7494600f21e051302f5c17ef9e73f2ac
Parents: 9cf3b71
Author: sandeep <sandysmdl@gmail.com>
Authored: Fri Feb 5 16:13:52 2016 +0530
Committer: Ajay Yadava <ajaynsit@gmail.com>
Committed: Fri Feb 5 16:13:52 2016 +0530

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


http://git-wip-us.apache.org/repos/asf/falcon/blob/943fc11d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 319c1ee..3dc3aa3 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ Trunk
     FALCON-1230 Data based notification Service to notify execution instances when data becomes
available(Pavan Kumar Kolamuri via Ajay Yadava)
 
   IMPROVEMENTS
+    FALCON-1721 Checkstyle doesn't extend parent.
+    
     FALCON-1818 Minor doc update for tar package locations after FALCON-1751 (Deepak Barr)
 
     FALCON-1729 Database ingest to support password alias via keystore file (Venkatesan Ramachandran
via Balu Vellanki)
@@ -28,6 +30,8 @@ Trunk
     FALCON-1770 Update README file (Ajay Yadava)
 
   BUG FIXES
+    FALCON-1804 Non-SLA feed throws NullPointerException.
+    
     FALCON-1806 Update documentation for Import and Export. (Venkatesan Ramachandran via
Balu Vellanki)
 
     FALCON-1787 Ooozie pig-action.xml requires hive sharelib for HCatalog use(Sowmya Ramesh
via Ajay Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/943fc11d/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..29bd7ba 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,10 @@ 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);
+        // Slas for feeds not having sla tag are not stored.
+        if (pendingInstances.get(feedCluster) != null) {
+            pendingInstances.get(feedCluster).remove(nominalTime);
+        }
     }
 
     private FileSystem initializeFileSystem() {


Mime
View raw message