You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2016/11/24 11:53:17 UTC

svn commit: r1771119 - /sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java

Author: tommaso
Date: Thu Nov 24 11:53:17 2016
New Revision: 1771119

URL: http://svn.apache.org/viewvc?rev=1771119&view=rev
Log:
SLING-6322 - fixed multiple resources deserialization for avro serializer

Modified:
    sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java

Modified: sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java?rev=1771119&r1=1771118&r2=1771119&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java (original)
+++ sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java Thu Nov 24 11:53:17 2016
@@ -172,12 +172,7 @@ public class AvroContentSerializer imple
         DataFileReader<AvroShallowResource> dataFileReader = new DataFileReader<AvroShallowResource>(new SeekableByteArrayInput(bytes), datumReader);
         Collection<AvroShallowResource> avroResources = new LinkedList<AvroShallowResource>();
         try {
-            AvroShallowResource avroResource = null;
-            while (dataFileReader.hasNext()) {
-// Reuse avroResource object by passing it to next(). This saves us from
-// allocating and garbage collecting many objects for files with
-// many items.
-                avroResource = dataFileReader.next(avroResource);
+            for (AvroShallowResource avroResource : dataFileReader) {
                 avroResources.add(avroResource);
             }
         } finally {