cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 9a7cdc0
Date Mon, 11 Aug 2014 13:58:52 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 edb5650c7 -> 9a7cdc0ad


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

(cherry picked from commit 8b5ec648423b7672846ca93f362269019bac3f94)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a7cdc0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a7cdc0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a7cdc0a

Branch: refs/heads/4.4
Commit: 9a7cdc0adbaa5ae6707086dff81944853ec9efd2
Parents: edb5650
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Thu Jun 5 09:54:46 2014 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Aug 11 15:58:38 2014 +0200

----------------------------------------------------------------------
 .../org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java    | 5 +++--
 utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a7cdc0a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
----------------------------------------------------------------------
diff --git a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
index 9a57ff0..fd2f9f3 100644
--- a/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
+++ b/plugins/event-bus/inmemory/src/org/apache/cloudstack/mom/inmemory/InMemoryEventBus.java
@@ -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>>();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a7cdc0a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
index 24d4d11..14eae16 100755
--- a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
+++ b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoff.java
@@ -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


Mime
View raw message