Author: tommaso
Date: Tue Jul 5 13:04:36 2016
New Revision: 1751462
URL: http://svn.apache.org/viewvc?rev=1751462&view=rev
Log:
SLING-5823 - Kryo instance not cached anymore
Modified:
sling/trunk/contrib/extensions/distribution/extensions/src/main/java/org/apache/sling/distribution/serialization/impl/kryo/KryoContentSerializer.java
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=1751462&r1=1751461&r2=1751462&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
Tue Jul 5 13:04:36 2016
@@ -58,15 +58,12 @@ public class KryoContentSerializer imple
private final Logger log = LoggerFactory.getLogger(getClass());
private final String name;
- private final Kryo kryo = new Kryo();
private final Set<String> ignoredProperties;
private final Set<String> ignoredNodeNames;
public KryoContentSerializer(String name) {
this.name = name;
- kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new
StdInstantiatorStrategy()));
- kryo.addDefaultSerializer(Resource.class, new ResourceSerializer());
- kryo.addDefaultSerializer(InputStream.class, new
InputStreamSerializer());
+
Set<String> iProps = new HashSet<String>();
iProps.add(JcrConstants.JCR_FROZENMIXINTYPES);
iProps.add(JcrConstants.JCR_FROZENPRIMARYTYPE);
@@ -87,6 +84,10 @@ public class KryoContentSerializer imple
@Override
public void exportToStream(ResourceResolver resourceResolver,
DistributionRequest request, OutputStream outputStream) throws
DistributionException {
+ Kryo kryo = new Kryo();
+ kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new
StdInstantiatorStrategy()));
+ kryo.addDefaultSerializer(Resource.class, new ResourceSerializer());
+ kryo.addDefaultSerializer(InputStream.class, new
InputStreamSerializer());
String[] paths = request.getPaths();
Output output = new Output(outputStream);
LinkedList<Resource> resources = new LinkedList<Resource>();
@@ -103,6 +104,10 @@ public class KryoContentSerializer imple
@Override
public void importFromStream(ResourceResolver resourceResolver,
InputStream stream) throws DistributionException {
+ Kryo kryo = new Kryo();
+ kryo.setInstantiatorStrategy(new Kryo.DefaultInstantiatorStrategy(new
StdInstantiatorStrategy()));
+ kryo.addDefaultSerializer(Resource.class, new ResourceSerializer());
+ kryo.addDefaultSerializer(InputStream.class, new
InputStreamSerializer());
try {
Input input = new Input(stream);
LinkedList<Resource> resources = (LinkedList<Resource>)
kryo.readObject(input, LinkedList.class);
