From 590f3114a41d9a710bbe0bdd36846f7b3c75e97c Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Sun, 26 Jul 2015 22:27:56 -0700
Subject: [PATCH] null out row

---
 .../apache/spark/sql/execution/UnsafeExternalRowSorter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
index 811d595a64ecd..4c3f2c6557140 100644
--- a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
+++ b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
@@ -124,7 +124,7 @@ Iterator<InternalRow> sort() throws IOException {
       return new AbstractScalaRowIterator() {
 
         private final int numFields = schema.length();
-        private final UnsafeRow row = new UnsafeRow();
+        private UnsafeRow row = new UnsafeRow();
 
         @Override
         public boolean hasNext() {
@@ -142,7 +142,7 @@ public InternalRow next() {
               sortedIterator.getRecordLength());
             if (!hasNext()) {
               UnsafeRow copy = row.copy(); // so that we don't have dangling pointers to freed page
-              row.pointTo(null, 0, 0, 0); // so that we don't keep references to the base object
+              row = null; // so that we don't keep references to the base object
               cleanupResources();
               return copy;
             } else {