You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2007/05/19 00:19:04 UTC
svn commit: r539616 - in /lucene/hadoop/trunk: CHANGES.txt
src/java/org/apache/hadoop/io/SequenceFile.java
Author: cutting
Date: Fri May 18 15:19:03 2007
New Revision: 539616
URL: http://svn.apache.org/viewvc?view=rev&rev=539616
Log:
HADOOP-1364. Fix inconsistent synchronization in SequenceFile. Contributed by Owen.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/io/SequenceFile.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=539616&r1=539615&r2=539616
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Fri May 18 15:19:03 2007
@@ -30,6 +30,9 @@
9. HADOOP-1359. Fix a potential NullPointerException in HDFS.
(Hairong Kuang via cutting)
+ 10. HADOOP-1364. Fix inconsistent synchronization in SequenceFile.
+ (omalley via cutting)
+
Branch 0.13 (unreleased changes)
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/io/SequenceFile.java?view=diff&rev=539616&r1=539615&r2=539616
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/io/SequenceFile.java Fri May 18 15:19:03 2007
@@ -1551,7 +1551,7 @@
* @return Returns the total record length
* @throws IOException
*/
- public int nextRaw(DataOutputBuffer key, ValueBytes val)
+ public synchronized int nextRaw(DataOutputBuffer key, ValueBytes val)
throws IOException {
if (!blockCompressed) {
if (in.getPos() >= end)
@@ -1653,7 +1653,7 @@
* @return Returns the value length
* @throws IOException
*/
- public int nextRawValue(ValueBytes val)
+ public synchronized int nextRawValue(ValueBytes val)
throws IOException {
// Position stream to current value