← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.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/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java
12
12
import com.google.common.base.Predicate;
13
13
import com.google.common.collect.Iterables;
14
14
import com.google.common.collect.Maps;
 
15
import com.google.common.collect.MapMaker;
15
16
 
16
17
public class StateUpdateHandler implements EventListener {
17
18
  private static Logger LOG = Logger.getLogger( StateUpdateHandler.class );
18
 
  private static final ConcurrentMap<String,StateUpdateHandler> clusterMap = Maps.newConcurrentHashMap( );
19
 
  private final ConcurrentMap<Class,AtomicBoolean> inflightMap = Maps.newConcurrentHashMap( );
20
 
  private final ConcurrentMap<Class,QueuedEventCallback> callbackMap = Maps.newConcurrentHashMap( );
 
19
  private static final MapMaker mMaker = new MapMaker();
 
20
  private static final ConcurrentMap<String,StateUpdateHandler> clusterMap = mMaker.makeMap();
 
21
  private final ConcurrentMap<Class,AtomicBoolean> inflightMap = mMaker.makeMap();
 
22
  private final ConcurrentMap<Class,QueuedEventCallback> callbackMap = mMaker.makeMap();
21
23
  private final Cluster cluster;
22
24
  
23
25
  public static void create( Cluster cluster, QueuedEventCallback callback ) {