You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by am...@apache.org on 2018/06/26 15:27:30 UTC
[ambari] branch trunk updated: AMBARI-24176. Deleting a service
fails to remove keytabs (amagyar) (#1624)
This is an automated email from the ASF dual-hosted git repository.
amagyar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9fabbe9 AMBARI-24176. Deleting a service fails to remove keytabs (amagyar) (#1624)
9fabbe9 is described below
commit 9fabbe90896ddaa7560add6cbc21b4777990ddad
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Tue Jun 26 17:27:28 2018 +0200
AMBARI-24176. Deleting a service fails to remove keytabs (amagyar) (#1624)
---
.../ambari/server/agent/stomp/AgentHostDataHolder.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
index 79c9751..cf43f24 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AgentHostDataHolder.java
@@ -53,10 +53,10 @@ public abstract class AgentHostDataHolder<T extends STOMPHostEvent & Hashable> e
}
public T initializeDataIfNeeded(Long hostId, boolean regenerateHash) throws AmbariException {
- T hostData = data.get(hostId);
- if (hostData == null) {
- updateLock.lock();
- try {
+ updateLock.lock();
+ try {
+ T hostData = data.get(hostId);
+ if (hostData == null) {
hostData = data.get(hostId);
if (hostData == null) {
hostData = getCurrentData(hostId);
@@ -65,11 +65,11 @@ public abstract class AgentHostDataHolder<T extends STOMPHostEvent & Hashable> e
}
data.put(hostId, hostData);
}
- } finally {
- updateLock.unlock();
}
+ return hostData;
+ } finally {
+ updateLock.unlock();
}
- return hostData;
}
/**