You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/05/08 19:06:27 UTC
ambari git commit: AMBARI-11006 - YARN Upgrade Pack For HDP-2.2 To
HDP-2.3 (part2) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 5c4e25e2b -> 41a41e64b
AMBARI-11006 - YARN Upgrade Pack For HDP-2.2 To HDP-2.3 (part2) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41a41e64
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41a41e64
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41a41e64
Branch: refs/heads/trunk
Commit: 41a41e64b0bfe5c14479555c95dcab2680f25f1f
Parents: 5c4e25e
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri May 8 13:06:06 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri May 8 13:06:20 2015 -0400
----------------------------------------------------------------------
.../server/serveraction/upgrades/ConfigureAction.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/41a41e64/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
index c064ac4..5c17408 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ConfigureAction.java
@@ -267,9 +267,14 @@ public class ConfigureAction extends AbstractServerAction {
"");
}
}
- }
- newValues.put(key, value);
+ // !!! only put a key/value into this map of new configurations if there
+ // was a key, otherwise this will put something like null=null into the
+ // configs which will cause NPEs after upgrade - this is a byproduct of
+ // the configure being able to take a list of transfers without a
+ // key/value to set
+ newValues.put(key, value);
+ }
// !!! check to see if we're going to a new stack and double check the
// configs are for the target. Then simply update the new properties instead