Author: omalley
Date: Mon Oct 15 10:18:24 2007
New Revision: 584825
URL: http://svn.apache.org/viewvc?rev=584825&view=rev
Log:
Merge -r 584823:584824 from trunk to branch 14 to fix HADOOP-2053.
Modified:
lucene/hadoop/branches/branch-0.14/CHANGES.txt
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/BasicTypeSorterBase.java
Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=584825&r1=584824&r2=584825&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Mon Oct 15 10:18:24 2007
@@ -1,6 +1,13 @@
Hadoop Change Log
+Release 0.14.3 - Unreleased
+
+ BUG FIXES
+
+ HADOOP-2053. Fixed a dangling reference to a memory buffer in the map
+ output sorter. (acmurthy via omalley)
+
Release 0.14.2 - 2007-10-09
BUG FIXES
Modified:
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/BasicTypeSorterBase.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/BasicTypeSorterBase.java?rev=584825&r1=584824&r2=584825&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/BasicTypeSorterBase.java
(original)
+++
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/BasicTypeSorterBase.java
Mon Oct 15 10:18:24 2007
@@ -120,6 +120,10 @@
pointers = null;
maxKeyLength = 0;
maxValLength = 0;
+
+ //release the large key-value buffer so that the GC, if necessary,
+ //can collect it away
+ keyValBuffer = null;
}
//A compare method that references the keyValBuffer through the indirect
//pointers
