← Back to branch summary

~ubuntu-branches/ubuntu/vivid/eucalyptus/vivid

« back to all changes in this revision

Viewing changes to clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultServiceBuilder.java

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-05-18 10:46:58 UTC
  • Revision ID: james.westby@ubuntu.com-20110518104658-umi4lvp0yqtu8cl9
Tags: 2.0.1+bzr1256-0ubuntu5
https://launchpad.net/bugs/784491
* Fix FTBFS against libgoogle-collections-java 1.0 (LP: #784491). 
  - debian/patches/26-google-collections-1.0-ftbfs.patch: refactoring
    to use 1.0 API.
* Fix libjibx-java to version 1.1 to allow entry of libjibx1.2-java 
  into universe without breaking eucalyptus:
  - debian/eucalyptus-java-common.links: use jibx-*-1.1.jar.
  - debian/build-jars: use jibx-*-1.1.jar.
  - debian/control: use libjibx1.1-java instead of libjibx-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/msgs/src/main/java/com/eucalyptus/component/DefaultServiceBuilder.java
8
8
import com.eucalyptus.util.NetworkUtil;
9
9
import com.google.common.collect.Lists;
10
10
import com.google.common.collect.Maps;
 
11
import com.google.common.collect.MapMaker;
11
12
 
12
13
public class DefaultServiceBuilder extends AbstractServiceBuilder<ServiceConfiguration> {
13
14
  private Component                         component;
14
 
  private Map<String, ServiceConfiguration> services = Maps.newConcurrentHashMap( );
 
15
  private Map<String, ServiceConfiguration> services = new MapMaker().makeMap( );
15
16
  
16
17
  public DefaultServiceBuilder( Component component ) {
17
18
    this.component = component;