Small fix for people that have JDK 1.8 installed on MacOSX and don't bother to fix their links

This commit is contained in:
Hugo Trippaers 2014-06-05 09:54:46 +02:00
parent d34419579e
commit 8b5ec64842
2 changed files with 4 additions and 3 deletions

View File

@ -26,12 +26,13 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.cloudstack.framework.events.Event;
import org.apache.cloudstack.framework.events.EventBus;
import org.apache.cloudstack.framework.events.EventBusException;
import org.apache.cloudstack.framework.events.EventSubscriber;
import org.apache.cloudstack.framework.events.EventTopic;
import org.apache.log4j.Logger;
import com.cloud.utils.Pair;
import com.cloud.utils.component.ManagerBase;
@ -41,7 +42,7 @@ public class InMemoryEventBus extends ManagerBase implements EventBus {
private static final Logger s_logger = Logger.getLogger(InMemoryEventBus.class);
private final static ConcurrentHashMap<UUID, Pair<EventTopic, EventSubscriber>> subscribers;
private final static Map<UUID, Pair<EventTopic, EventSubscriber>> subscribers;
static {
subscribers = new ConcurrentHashMap<UUID, Pair<EventTopic, EventSubscriber>>();

View File

@ -45,7 +45,7 @@ import com.cloud.utils.component.AdapterBase;
@Local(value = {BackoffAlgorithm.class})
public class ConstantTimeBackoff extends AdapterBase implements BackoffAlgorithm, ConstantTimeBackoffMBean {
long _time;
private final ConcurrentHashMap<String, Thread> _asleep = new ConcurrentHashMap<String, Thread>();
private final Map<String, Thread> _asleep = new ConcurrentHashMap<String, Thread>();
private final static Log LOG = LogFactory.getLog(ConstantTimeBackoff.class);
@Override