commit | 9fbc78cb4a9d1dccdbdbb70a1ee48f2afddfe067 | [log] [tgz] |
---|---|---|
author | Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com> | Sun Dec 11 15:12:25 2016 +0200 |
committer | Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com> | Sun Dec 11 13:56:46 2016 +0000 |
tree | 2a56cbe7e46bf5603491579a0500dbc390466446 | |
parent | 1a1962382413b0e5adbfb52bb33968df265b35c5 [diff] |
Remove YAML tags from CM output What "adaptForSaltYamlTypes" does is pass a string to the "java.lang.String" constructor. No point in that, use the argument string directly.
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java index e48c0b2..fdae93b 100644 --- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java +++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
@@ -73,7 +73,7 @@ private static String adaptForSaltYamlTypes(String description) { - return description.replaceAll("!!python/unicode", "!!java.lang.String"); + return description.replaceAll("!!python/unicode\\s+", ""); } @SuppressWarnings("unchecked")