Repository: falcon Updated Branches: refs/heads/master 37cb056b9 -> 732395765
FALCON-2203, fixing merge issue Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/73239576 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/73239576 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/73239576 Branch: refs/heads/master Commit: 732395765712994a2c517291a84793b8d99e8c26 Parents: 37cb056 Author: Pallavi Rao <[email protected]> Authored: Thu Dec 1 16:25:35 2016 +0530 Committer: Pallavi Rao <[email protected]> Committed: Thu Dec 1 16:25:35 2016 +0530 ---------------------------------------------------------------------- .../falcon/jdbc/MonitoringJdbcStateStore.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/73239576/prism/src/main/java/org/apache/falcon/jdbc/MonitoringJdbcStateStore.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/jdbc/MonitoringJdbcStateStore.java b/prism/src/main/java/org/apache/falcon/jdbc/MonitoringJdbcStateStore.java index 7f5776e..8da2389 100644 --- a/prism/src/main/java/org/apache/falcon/jdbc/MonitoringJdbcStateStore.java +++ b/prism/src/main/java/org/apache/falcon/jdbc/MonitoringJdbcStateStore.java @@ -17,21 +17,21 @@ */ package org.apache.falcon.jdbc; +import java.util.Date; +import java.util.List; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import javax.persistence.TypedQuery; +import org.apache.commons.collections.CollectionUtils; import org.apache.falcon.FalconException; +import org.apache.falcon.persistence.EntitySLAAlertBean; import org.apache.falcon.persistence.MonitoredEntityBean; import org.apache.falcon.persistence.PendingInstanceBean; import org.apache.falcon.persistence.PersistenceConstants; -import org.apache.falcon.persistence.ResultNotFoundException; -import org.apache.falcon.persistence.EntitySLAAlertBean; import org.apache.falcon.persistence.ProcessInstanceInfoBean; +import org.apache.falcon.persistence.ResultNotFoundException; import org.apache.falcon.service.FalconJPAService; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import java.util.Date; -import java.util.List; - /** * StateStore for MonitoringEntity and PendingEntityInstances. */
