Author: mduerig
Date: Tue Jan 19 13:00:51 2016
New Revision: 1725511
URL: http://svn.apache.org/viewvc?rev=1725511&view=rev
Log:
OAK-3348: Cross gc sessions might introduce references to pre-compacted segments
Missing parenthesis
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java?rev=1725511&r1=1725510&r2=1725511&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
Tue Jan 19 13:00:51 2016
@@ -113,7 +113,7 @@ public class Compactor {
}
public Compactor(SegmentTracker tracker, CompactionStrategy
compactionStrategy, Supplier<Boolean> cancel) {
- String wid = "c-" + tracker.getCompactionMap().getGeneration() + 1;
+ String wid = "c-" + (tracker.getCompactionMap().getGeneration() + 1);
this.writer = tracker.createSegmentWriter(wid);
if (compactionStrategy.getPersistCompactionMap()) {
this.map = new PersistedCompactionMap(tracker);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java?rev=1725511&r1=1725510&r2=1725511&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
Tue Jan 19 13:00:51 2016
@@ -247,7 +247,7 @@ public class PersistedCompactionMap impl
@Nonnull
private String createWid() {
- return "cm-" + tracker.getCompactionMap().getGeneration() + 1;
+ return "cm-" + (tracker.getCompactionMap().getGeneration() + 1);
}
/**
