MLHR-1820 Fix NPE if an embeddable query info provider is not set on the snapshot server.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/36e8ae3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/36e8ae3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/36e8ae3d Branch: refs/heads/devel-3 Commit: 36e8ae3db68f5d3ffab2bca0664e85c25ddbd022 Parents: ee92fc9 Author: Timothy Farkas <[email protected]> Authored: Wed Aug 26 18:00:23 2015 -0700 Committer: David Yan <[email protected]> Committed: Fri Aug 28 18:49:57 2015 -0700 ---------------------------------------------------------------------- .../lib/appdata/snapshot/AbstractAppDataSnapshotServer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/36e8ae3d/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java index a51908f..af89109 100644 --- a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java +++ b/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java @@ -158,7 +158,9 @@ public abstract class AbstractAppDataSnapshotServer<INPUT_EVENT> implements Oper @Override final public void activate(OperatorContext ctx) { - embeddableQueryInfoProvider.activate(ctx); + if (embeddableQueryInfoProvider != null) { + embeddableQueryInfoProvider.activate(ctx); + } } @SuppressWarnings("unchecked")
