Repository: ambari Updated Branches: refs/heads/trunk e70985490 -> bd3082473
AMBARI-19170 - NPE during Ambari server schema upgrade (Attila Doroszlai via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bd308247 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bd308247 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bd308247 Branch: refs/heads/trunk Commit: bd308247344ea067bcf2f120c28e5bc0eb312c58 Parents: e709854 Author: Jonathan Hurley <[email protected]> Authored: Tue Dec 13 13:12:12 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Tue Dec 13 13:12:12 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bd308247/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java index 64787c5..fc724ab 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java @@ -1564,7 +1564,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog { * * @throws SQLException */ - @Transactional void updateServiceComponentDesiredStateTableDDL() throws SQLException { if (dbAccessor.tableHasPrimaryKey(SERVICE_COMPONENT_DS_TABLE, ID)) { LOG.info("Skipping {} table Primary Key modifications since the new {} column already exists", @@ -2786,7 +2785,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog { * Update view instance table's cluster_handle column to have cluster_id * instead of cluster_name */ - @Transactional void updateViewInstanceTable() throws SQLException { try { if (Long.class.equals(dbAccessor.getColumnClass(VIEWINSTANCE_TABLE, CLUSTER_HANDLE_COLUMN))) {
