diff options
| author | Kengo Seki <sekikn@apache.org> | 2017-05-22 19:40:03 -0400 |
|---|---|---|
| committer | Evans Ye <evansye@apache.org> | 2017-07-01 12:52:54 +0000 |
| commit | 750efb5fa96043d5ecccc171380d1e4b65cbf5ab (patch) | |
| tree | 33c9fbf3814e7561071a99db7d47ff463fe9b0b7 | |
| parent | 5874ba53dba27454cb100b5637ba426430ce6d1d (diff) | |
BIGTOP-2771. ambari: build failed due to using third-party ConcurrentHashMap instead of the standard one unnecessarily
Closes #212
| -rw-r--r-- | bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff b/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff new file mode 100644 index 00000000..bf0980e7 --- /dev/null +++ b/bigtop-packages/src/common/ambari/patch2-AMBARI-ConcurrentHashMap.diff @@ -0,0 +1,19 @@ +diff -ruaN apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java +--- apache-ambari-2.5.0-src.orig/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-03-27 20:46:35.000000000 -0400 ++++ apache-ambari-2.5.0-src/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java 2017-05-21 23:48:37.676372818 -0400 +@@ -25,6 +25,7 @@ + import java.util.Map; + import java.util.Map.Entry; + import java.util.Set; ++import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.ConcurrentMap; + import java.util.concurrent.locks.Lock; + import java.util.concurrent.locks.ReadWriteLock; +@@ -77,7 +78,6 @@ + import org.apache.ambari.server.state.fsm.StateMachine; + import org.apache.ambari.server.state.fsm.StateMachineFactory; + import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper; +-import org.jboss.netty.util.internal.ConcurrentHashMap; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + |