SLIDER-173 Fix typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a048c9f5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a048c9f5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a048c9f5 Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it Commit: a048c9f59c8252905e3b3a9a87ea7ceb49f50cf7 Parents: 581c182 Author: tedyu <yuzhih...@gmail.com> Authored: Fri Jun 27 11:40:25 2014 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Fri Jun 27 11:40:25 2014 -0700 ---------------------------------------------------------------------- .../org/apache/slider/providers/agent/AgentProviderService.java | 1 + .../apache/slider/server/appmaster/state/ContainerPriority.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a048c9f5/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 a685a3e..85aa8db 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 @@ -634,6 +634,7 @@ public class AgentProviderService extends AbstractProviderService implements Application application = getMetainfo().getApplication(); if (application == null) { log.error("Malformed app definition: Expect application as the top level element for metainfo.xml"); + return scriptPath; } for (Component component : application.getComponents()) { if (component.getName().equals(roleName)) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a048c9f5/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java index 935c09f..56a5af2 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ContainerPriority.java @@ -43,7 +43,7 @@ public final class ContainerPriority { public static int buildPriority(int role, boolean locationSpecified) { int location = locationSpecified ? LOCATION : 0; - return role | LOCATION; + return role | location; }
