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/04/22 13:50:12 UTC
svn commit: r1740486 - in
/sling/trunk/contrib/extensions/distribution/extensions/src:
main/java/org/apache/sling/distribution/serialization/impl/avro/
main/java/org/apache/sling/distribution/serialization/impl/kryo/
test/java/org/apache/sling/distribu...
Author: tommaso
Date: Fri Apr 22 11:50:12 2016
New Revision: 1740486
URL: http://svn.apache.org/viewvc?rev=1740486&view=rev
Log:
SLING-5577 - minor missing fixes to avro and kryo content serializers
Modified:
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/avro/AvroContentSerializer.java
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializerTest.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=1740486&r1=1740485&r2=1740486&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 Fri Apr 22 11:50:12 2016
@@ -122,7 +122,6 @@ public class AvroContentSerializer imple
throw new DistributionException(e);
} finally {
try {
- outputStream.close();
writer.close();
} catch (IOException e) {
// do nothing
Modified: sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java?rev=1740486&r1=1740485&r2=1740486&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java (original)
+++ sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java Fri Apr 22 11:50:12 2016
@@ -97,8 +97,6 @@ public class KryoContentSerializer imple
}
kryo.writeObject(output, resources);
output.flush();
- byte[] buffer = output.getBuffer();
- output.close();
}
Modified: sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializerTest.java?rev=1740486&r1=1740485&r2=1740486&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/extensions/src/test/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializerTest.java Fri Apr 22 11:50:12 2016
@@ -21,6 +21,7 @@ package org.apache.sling.distribution.se
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import org.apache.commons.io.IOUtils;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.DistributionRequest;
import org.apache.sling.distribution.DistributionRequestType;
@@ -32,6 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
* Tests for {@link KryoContentSerializer}
@@ -59,6 +61,7 @@ public class KryoContentSerializerTest {
kryoContentSerializer.exportToStream(resourceResolver, request, outputStream);
byte[] bytes = outputStream.toByteArray();
assertNotNull(bytes);
+ assertTrue(bytes.length > 0);
}
@Test