Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Merge pull request #69 from DevFactory/release/collapsable-if-statements-should-be-merged

Browse Source 
Code quality fix - Collapsible "if" statements should be merged.
This commit is contained in:
Roman Leventov
2016-02-13 17:54:51 +07:00
parent 2864bf4be8 efd3e1f05a
commit 57881bfdfa
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/hash/impl/stage/entry/UpdateLock.java
+2 -3
View File
@@ -182,9 +182,8 @@ public class UpdateLock implements InterProcessLock {
return;
case UPDATE_LOCKED:
entry.closeDelayedUpdateChecksum();
if (s.decrementUpdate() == 0) {
if (s.writeZero())
s.segmentHeader.downgradeUpdateToReadLock(s.segmentHeaderAddress);
if (s.decrementUpdate() == 0 && s.writeZero()) {
s.segmentHeader.downgradeUpdateToReadLock(s.segmentHeaderAddress);
}
break;
case WRITE_LOCKED:
src/main/java/net/openhft/chronicle/hash/impl/stage/query/HashQuery.java
+3 -5
View File
@@ -71,11 +71,9 @@ public abstract class HashQuery<K> implements SetEntry<K> {
if (s.nestedContextsLockedOnSameSegment &&
s.rootContextLockedOnThisSegment.latestSameThreadSegmentModCount() !=
s.contextModCount) {
if (ks.keySearchInit()) {
if (ks.searchState == PRESENT) {
if (!hashLookupSearch.checkSlotContainsExpectedKeyAndValue(entry.pos))
hlp.closeHashLookupPos();
}
if (ks.keySearchInit() && ks.searchState == PRESENT &&
!hashLookupSearch.checkSlotContainsExpectedKeyAndValue(entry.pos)) {
hlp.closeHashLookupPos();
}
}
}
src/main/java/net/openhft/chronicle/map/impl/stage/entry/MapEntryStages.java
+3 -4
View File
@@ -215,10 +215,9 @@ public abstract class MapEntryStages<K, V> extends HashEntryStages<K>
boolean tierHasChanged = allocatedChunks.initEntryAndKeyCopying(
entrySize, valueSizeOffset - keySizeOffset, pos, entrySizeInChunks);
if (tierHasChanged) {
// implicitly inits key search, locating hashLookupPos on the empty slot
if (!ks.searchStateAbsent())
throw new AssertionError();
// implicitly inits key search, locating hashLookupPos on the empty slot
if (tierHasChanged && !ks.searchStateAbsent()) {
throw new AssertionError();
}
initValue(newValue);