You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2016/07/29 00:23:38 UTC
incubator-slider git commit: SLIDER-1153 Code issues - one more npe
and few incorrect expression cleanups
Repository: incubator-slider
Updated Branches:
refs/heads/develop 3f1d672a3 -> 094f0795c
SLIDER-1153 Code issues - one more npe and few incorrect expression cleanups
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/094f0795
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/094f0795
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/094f0795
Branch: refs/heads/develop
Commit: 094f0795c49be2433c7913d7aa442656bbf5b3cd
Parents: 3f1d672
Author: Gour Saha <go...@apache.org>
Authored: Thu Jul 28 17:23:17 2016 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Thu Jul 28 17:23:17 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/state/AppState.java | 1 -
.../apache/slider/server/appmaster/state/ProviderAppState.java | 1 -
.../apache/slider/server/services/security/SecurityUtils.java | 4 +++-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/094f0795/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
index 4b76fe8..16c2435 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
@@ -918,7 +918,6 @@ public class AppState {
* Build up the requirements of every resource
*/
private void buildRoleResourceRequirements() {
- roleStatusMap.values();
for (RoleStatus role : roleStatusMap.values()) {
role.setResourceRequirements(
buildResourceRequirements(role, recordFactory.newResource()));
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/094f0795/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
index c409114..37e9a7f 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
@@ -254,7 +254,6 @@ public class ProviderAppState implements StateAccessForProviders {
public List<RoleInstance> enumLiveInstancesInRole(String role) {
List<RoleInstance> nodes = new ArrayList<>();
Collection<RoleInstance> allRoleInstances = cloneLiveContainerInfoList();
- getLiveContainers().values();
for (RoleInstance node : allRoleInstances) {
if (role.isEmpty() || role.equals(node.role)) {
nodes.add(node);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/094f0795/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java b/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java
index 0f1cd72..e82ad84 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/security/SecurityUtils.java
@@ -160,7 +160,9 @@ public class SecurityUtils {
String keyStoreLocation = configMap.getOption(
SliderXmlConfKeys.KEY_KEYSTORE_LOCATION, getDefaultKeystoreLocation());
if (keyStoreLocation == null) {
- LOG.error(SliderXmlConfKeys.KEY_KEYSTORE_LOCATION + " is not specified.");
+ LOG.error(SliderXmlConfKeys.KEY_KEYSTORE_LOCATION
+ + " is not specified. Unable to initialize security params.");
+ return;
}
File secDirFile = new File(keyStoreLocation).getParentFile();
if (!secDirFile.exists()) {