| commit | 67192ef2c09296600ebe985d2b03c256283011c4 | [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 15:12:25 2016 +0200 |
| tree | 92134db07c8a39c55874c0bc1519f355e645f09d | |
| parent | 0c059cb828598a5655651f6b3e6a7ee3a80bd373 [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")