| commit | e56526423dd70c07e3b51a81c9a4bd032ba74b1e | [log] [tgz] |
|---|---|---|
| author | Till Westmann <tillw@apache.org> | Wed Aug 24 14:00:18 2016 -0700 |
| committer | Michael Blow <mblow@apache.org> | Wed Aug 24 21:47:44 2016 -0700 |
| tree | c78b665fe665c123f609172ca021b14cebc0bf38 | |
| parent | 3b2acdc01d46a877d47fd13c2e9f4e30f7233275 [diff] |
Avoid NPE in AsterixHyracksIntegrationUtil.deinit Change-Id: I4af385918becc2dfbc40462c9505135d91ea859f Reviewed-on: https://asterix-gerrit.ics.uci.edu/1107 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mblow@apache.org>
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java index b1bf418..03ed3c4 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -56,6 +56,7 @@ private AsterixPropertiesAccessor propertiesAccessor; public void init(boolean deleteOldInstanceData) throws Exception { + ncs = new NodeControllerService[0]; // ensure that ncs is not null propertiesAccessor = new AsterixPropertiesAccessor(); if (deleteOldInstanceData) { deleteTransactionLogs();