Repository: geode Updated Branches: refs/heads/develop 8a2983f6e -> 8b94e2ec2
GEODE-2551 Fix code issues found by AppChecker This closes #408 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/8b94e2ec Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8b94e2ec Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8b94e2ec Branch: refs/heads/develop Commit: 8b94e2ec2dc1192e96fc822b4b3a49561a76b2dc Parents: 8a2983f Author: Anthony Baker <[email protected]> Authored: Sun Feb 26 13:20:34 2017 -0800 Committer: Anthony Baker <[email protected]> Committed: Wed Mar 1 12:49:14 2017 -0800 ---------------------------------------------------------------------- .../apache/geode/management/internal/cli/parser/ParserUtils.java | 2 +- .../org/apache/geode/management/internal/cli/util/JsonUtil.java | 2 +- .../apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/8b94e2ec/geode-core/src/main/java/org/apache/geode/management/internal/cli/parser/ParserUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/parser/ParserUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/parser/ParserUtils.java index 9faccb6..80f1286 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/parser/ParserUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/parser/ParserUtils.java @@ -93,7 +93,7 @@ public class ParserUtils { // Remove quotes from the beginning and end of split strings for (int i = 0; i < split.length; i++) { - if ((split[i].endsWith("\"") && split[i].endsWith("\"")) + if ((split[i].startsWith("\"") && split[i].endsWith("\"")) || (split[i].startsWith("\'") && split[i].endsWith("\'"))) { split[i] = split[i].substring(1, split[i].length() - 1); } http://git-wip-us.apache.org/repos/asf/geode/blob/8b94e2ec/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java index 510575b..166b375 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JsonUtil.java @@ -385,7 +385,7 @@ public class JsonUtil { return value; } else if (klass.isAssignableFrom(Long.class) || klass.isAssignableFrom(long.class)) { return value; - } else if (klass.isAssignableFrom(Float.class) || klass.isAssignableFrom(Float.class)) { + } else if (klass.isAssignableFrom(Float.class) || klass.isAssignableFrom(float.class)) { return value; } else if (klass.isAssignableFrom(Double.class) || klass.isAssignableFrom(double.class)) { return value; http://git-wip-us.apache.org/repos/asf/geode/blob/8b94e2ec/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java index 525aa2f..c650258 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/SelectStarQueryDUnitTest.java @@ -1381,7 +1381,7 @@ public class SelectStarQueryDUnitTest extends JUnit4CacheTestCase { + obj.getClass()); } } - } else if (rs instanceof PortfolioPdx || rs instanceof PortfolioPdx) { + } else if (rs instanceof PortfolioPdx) { } else { fail("Result objects for remote client query: " + queries[i] + " should be instance of PortfolioPdx and not " + rs.getClass()); @@ -1441,7 +1441,7 @@ public class SelectStarQueryDUnitTest extends JUnit4CacheTestCase { + obj.getClass()); } } - } else if (rs instanceof PortfolioPdx || rs instanceof PortfolioPdx) { + } else if (rs instanceof PortfolioPdx) { } else { fail("Result objects for remote client query: " + queries[i] + " should be instance of PortfolioPdx and not " + rs.getClass());
