You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by te...@apache.org on 2014/06/11 19:01:40 UTC
git commit: SLIDER-122 Check against null is missing in some classes
Repository: incubator-slider
Updated Branches:
refs/heads/develop 71aef45ba -> 94e177f87
SLIDER-122 Check against null is missing in some classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/94e177f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/94e177f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/94e177f8
Branch: refs/heads/develop
Commit: 94e177f87d8cbf75929e71db13d1654c7cc95877
Parents: 71aef45
Author: tedyu <yu...@gmail.com>
Authored: Wed Jun 11 10:01:28 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Jun 11 10:01:28 2014 -0700
----------------------------------------------------------------------
.../apache/slider/core/zk/ZookeeperUtils.java | 24 +++++++++++++++-----
.../services/workflow/ForkedProcessService.java | 4 +++-
2 files changed, 21 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/94e177f8/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java b/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
index ea56bc2..8bf25f9 100644
--- a/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
@@ -45,9 +45,15 @@ public class ZookeeperUtils {
public static List<String> splitToPairs(String hostPortQuorumList) {
// split an address hot
String[] strings = StringUtils.getStrings(hostPortQuorumList);
- List<String> tuples = new ArrayList<>(strings.length);
- for (String s : strings) {
- tuples.add(s.trim());
+ int len = 0;
+ if (strings != null) {
+ len = strings.length;
+ }
+ List<String> tuples = new ArrayList<>(len);
+ if (strings != null) {
+ for (String s : strings) {
+ tuples.add(s.trim());
+ }
}
return tuples;
}
@@ -60,9 +66,15 @@ public class ZookeeperUtils {
public static List<HostAndPort> splitToHostsAndPorts(String hostPortQuorumList) {
// split an address hot
String[] strings = StringUtils.getStrings(hostPortQuorumList);
- List<HostAndPort> list = new ArrayList<>(strings.length);
- for (String s : strings) {
- list.add(HostAndPort.fromString(s.trim()));
+ int len = 0;
+ if (strings != null) {
+ len = strings.length;
+ }
+ List<HostAndPort> list = new ArrayList<>(len);
+ if (strings != null) {
+ for (String s : strings) {
+ list.add(HostAndPort.fromString(s.trim()));
+ }
}
return list;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/94e177f8/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index 900e722..13ed783 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -252,7 +252,9 @@ public class ForkedProcessService extends AbstractWorkflowExecutorService implem
}
public int getExitCodeSignCorrected() {
- return process.getExitCodeSignCorrected();
+ Integer exitCode = process.getExitCodeSignCorrected();
+ if (exitCode == null) return -1;
+ return exitCode;
}
/**