You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2018/11/06 00:26:22 UTC
[geode] branch develop updated: GEODE-5992 Fix bugs identified by
static analysis
This is an automated email from the ASF dual-hosted git repository.
abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new b65b364 GEODE-5992 Fix bugs identified by static analysis
b65b364 is described below
commit b65b36477b931453276c72138bde676f6c5362db
Author: Anthony Baker <ab...@apache.org>
AuthorDate: Mon Nov 5 12:47:38 2018 -0800
GEODE-5992 Fix bugs identified by static analysis
---
.../main/java/org/apache/geode/internal/offheap/FreeListManager.java | 4 ++--
.../java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java | 2 +-
.../apache/geode/management/internal/cli/result/ResultBuilder.java | 4 ----
.../org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java | 3 +--
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
index 2aea0d1..bd863d4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/FreeListManager.java
@@ -836,7 +836,7 @@ public class FreeListManager {
Collections.sort(value, new Comparator<MemoryBlock>() {
@Override
public int compare(MemoryBlock o1, MemoryBlock o2) {
- return Long.valueOf(o1.getAddress()).compareTo(o2.getAddress());
+ return Long.compare(o1.getAddress(), o2.getAddress());
}
});
return value;
@@ -881,7 +881,7 @@ public class FreeListManager {
Collections.sort(value, new Comparator<MemoryBlock>() {
@Override
public int compare(MemoryBlock o1, MemoryBlock o2) {
- return Long.valueOf(o1.getAddress()).compareTo(o2.getAddress());
+ return Long.compare(o1.getAddress(), o2.getAddress());
}
});
return value;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
index fc08d76..c0f2f77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
@@ -511,7 +511,7 @@ public class MemoryAllocatorImpl implements MemoryAllocator {
Collections.sort(orphans, new Comparator<MemoryBlock>() {
@Override
public int compare(MemoryBlock o1, MemoryBlock o2) {
- return Long.valueOf(o1.getAddress()).compareTo(o2.getAddress());
+ return Long.compare(o1.getAddress(), o2.getAddress());
}
});
// this.memoryBlocks = new WeakReference<List<MemoryBlock>>(orphans);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
index 41728ea..0bd40c4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java
@@ -386,10 +386,6 @@ public class ResultBuilder {
public SectionResultData addSection(String keyToRetrieve) {
throw new UnsupportedOperationException("This is read only result data");
}
-
- public CompositeResultData addSeparator(char buildSeparatorFrom) {
- throw new UnsupportedOperationException("This is read only result data");
- }
};
} else {
ErrorResultData errorResultData = new ErrorResultData();
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
index 24e596a..87595d1 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/json/PdxInstanceSortedHelper.java
@@ -250,8 +250,7 @@ public class PdxInstanceSortedHelper implements JSONToPdxMapper {
factory.writeObject(key.fieldName, key.value);
break;
default:
- new RuntimeException("Unable to convert json field " + key);
- break;
+ throw new RuntimeException("Unable to convert json field " + key);
}
}