You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2011/01/26 19:40:31 UTC

svn commit: r1063820 - in /thrift/trunk/lib/java/src/org/apache/thrift: TDeserializer.java transport/TMemoryInputTransport.java

Author: bryanduxbury
Date: Wed Jan 26 18:40:30 2011
New Revision: 1063820

URL: http://svn.apache.org/viewvc?rev=1063820&view=rev
Log:
THRIFT-1041. java: TDeserializer holds onto a reference of the array it reads after it is done deserializing

This patch makes sure that after using the bytes passed in, no references are retained.


Modified:
    thrift/trunk/lib/java/src/org/apache/thrift/TDeserializer.java
    thrift/trunk/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java

Modified: thrift/trunk/lib/java/src/org/apache/thrift/TDeserializer.java
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/src/org/apache/thrift/TDeserializer.java?rev=1063820&r1=1063819&r2=1063820&view=diff
==============================================================================
--- thrift/trunk/lib/java/src/org/apache/thrift/TDeserializer.java (original)
+++ thrift/trunk/lib/java/src/org/apache/thrift/TDeserializer.java Wed Jan 26 18:40:30 2011
@@ -68,6 +68,7 @@ public class TDeserializer {
       trans_.reset(bytes);
       base.read(protocol_);
     } finally {
+      trans_.clear();
       protocol_.reset();
     }
   }
@@ -108,6 +109,7 @@ public class TDeserializer {
     } catch (Exception e) {
       throw new TException(e);
     } finally {
+      trans_.clear();
       protocol_.reset();
     }
   }
@@ -228,6 +230,7 @@ public class TDeserializer {
     } catch (Exception e) {
       throw new TException(e);
     } finally {
+      trans_.clear();
       protocol_.reset();
     }
   }
@@ -284,6 +287,7 @@ public class TDeserializer {
     } catch (Exception e) {
       throw new TException(e);
     } finally {
+      trans_.clear();
       protocol_.reset();
     }
   }

Modified: thrift/trunk/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java?rev=1063820&r1=1063819&r2=1063820&view=diff
==============================================================================
--- thrift/trunk/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java (original)
+++ thrift/trunk/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java Wed Jan 26 18:40:30 2011
@@ -45,6 +45,10 @@ public final class TMemoryInputTransport
     endPos_ = offset + length;
   }
 
+  public void clear() {
+    buf_ = null;
+  }
+
   @Override
   public void close() {}