Author: ecn
Date: Wed May 30 19:11:51 2012
New Revision: 1344420
URL: http://svn.apache.org/viewvc?rev=1344420&view=rev
Log:
ACCUMULO-578 fix a previously broken merge
Modified:
accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Modified:
accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1344420&r1=1344419&r2=1344420&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
(original)
+++
accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Wed May 30 19:11:51 2012
@@ -3250,7 +3250,8 @@ public class Tablet {
span.data("written", "" + mcs.getEntriesWritten());
majCStats.add(mcs);
- datafileManager.bringMajorCompactionOnline(smallestFiles,
compactTmpName, fileName, filesToCompact.size() == 0 ? compactionId.getFirst()
: null,
+ datafileManager.bringMajorCompactionOnline(smallestFiles,
compactTmpName, fileName,
+ filesToCompact.size() == 0 && compactionId != null ?
compactionId.getFirst() : null,
new DataFileValue(mcs.getFileSize(), mcs.getEntriesWritten()));
// when major compaction produces a file w/ zero entries, it will be
deleted... do not want
