You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/28 04:21:18 UTC
[13/44] git commit: SLIDER-101 from tedyu
SLIDER-101 from tedyu
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ab246e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ab246e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ab246e27
Branch: refs/heads/master
Commit: ab246e270d28eb6962f1b3e6410ff8e15eae7454
Parents: 764c68a
Author: Steve Loughran <st...@hortonworks.com>
Authored: Thu May 22 11:13:10 2014 +0100
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Thu May 22 11:13:10 2014 +0100
----------------------------------------------------------------------
.../slider/core/conf/AbstractInputPropertiesValidator.java | 4 +++-
.../org/apache/slider/providers/agent/AgentProviderService.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ab246e27/slider-core/src/main/java/org/apache/slider/core/conf/AbstractInputPropertiesValidator.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/AbstractInputPropertiesValidator.java b/slider-core/src/main/java/org/apache/slider/core/conf/AbstractInputPropertiesValidator.java
index 6c27c22..336b4dc 100644
--- a/slider-core/src/main/java/org/apache/slider/core/conf/AbstractInputPropertiesValidator.java
+++ b/slider-core/src/main/java/org/apache/slider/core/conf/AbstractInputPropertiesValidator.java
@@ -35,7 +35,9 @@ public abstract class AbstractInputPropertiesValidator implements InputPropertie
protected void validateComponentProperties(ConfTreeOperations props)
throws BadConfigException {
for (String compName : props.getComponentNames()) {
- for (String key : props.getComponent(compName).keySet()) {
+ MapOperations mo = props.getComponent(compName);
+ if (mo == null) continue;
+ for (String key : mo.keySet()) {
validatePropertyNamePrefix(key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ab246e27/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index f7f2b21..f4eec25 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -107,7 +107,7 @@ public class AgentProviderService extends AbstractProviderService implements
private AgentClientProvider clientProvider;
private Map<String, ComponentInstanceState> componentStatuses = new HashMap<>();
private AtomicInteger taskId = new AtomicInteger(0);
- private Metainfo metainfo = null;
+ private volatile Metainfo metainfo = null;
private ComponentCommandOrder commandOrder = null;
public AgentProviderService() {
@@ -742,7 +742,7 @@ public class AgentProviderService extends AbstractProviderService implements
//apply any port updates
if (!this.getAllocatedPorts().isEmpty()) {
for (String key : config.keySet()) {
- if (this.getAllocatedPorts().keySet().contains(key)) {
+ if (this.getAllocatedPorts().containsKey(key)) {
config.put(key, getAllocatedPorts().get(key));
}
}