This closes #505 BROOKLYN-404: fix ConcurrentModificationException in BrooklynProperties
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0570ca5a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0570ca5a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0570ca5a Branch: refs/heads/master Commit: 0570ca5a54dbd045c2bd007ea1a18d9f139762fb Parents: 972a0d8 4c1fe06 Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Tue Jan 24 12:18:40 2017 +0000 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Tue Jan 24 12:18:40 2017 +0000 ---------------------------------------------------------------------- .../brooklyn/core/config/ConfigUtils.java | 15 +- .../core/internal/BrooklynProperties.java | 29 ++- .../core/internal/BrooklynPropertiesImpl.java | 183 ++++++++++++++----- .../core/location/BasicLocationDefinition.java | 4 +- .../core/location/BasicLocationRegistry.java | 5 +- .../BasicExternalConfigSupplierRegistry.java | 6 +- .../internal/DeferredBrooklynProperties.java | 84 ++++----- .../config/BrooklynPropertiesBuilderTest.java | 8 +- .../core/config/BrooklynPropertiesTest.java | 13 +- .../internal/LocalManagementContextTest.java | 6 +- .../brooklyn/launcher/BrooklynLauncher.java | 2 +- ...lynLauncherRebindToCloudObjectStoreTest.java | 2 +- .../jclouds/BailOutJcloudsLocation.java | 8 +- .../location/jclouds/JcloudsLocationTest.java | 6 +- .../brooklynnode/LocalBrooklynNodeImpl.java | 6 +- 15 files changed, 246 insertions(+), 131 deletions(-) ----------------------------------------------------------------------
