You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:51 UTC
[48/50] brooklyn-library git commit: Fix NginxController's use of
LinkedHashMultimap
Fix NginxController's use of LinkedHashMultimap
- Don't call private constructor, which has been deleted in
guava 13.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/459a453d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/459a453d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/459a453d
Branch: refs/heads/0.4.0
Commit: 459a453dff7e1fb5352d365541f5286a23092006
Parents: ff5d3c7
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 13 15:34:50 2012 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Jan 14 16:49:29 2013 +0000
----------------------------------------------------------------------
.../main/java/brooklyn/entity/proxy/nginx/NginxController.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/459a453d/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
index 46a93f2..76673b9 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
@@ -248,7 +248,7 @@ public class NginxController extends AbstractController {
// For mapping by URL
Iterable<UrlMapping> mappings = findUrlMappings();
- Multimap<String, UrlMapping> mappingsByDomain = new LinkedHashMultimap<String, UrlMapping>();
+ Multimap<String, UrlMapping> mappingsByDomain = LinkedHashMultimap.create();
for (UrlMapping mapping : mappings) {
Collection<String> addrs = mapping.getAttribute(UrlMapping.TARGET_ADDRESSES);
if (addrs) {