mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-07 19:52:03 +01:00
Code Issues Projects Releases Wiki Activity

Upgrade Kryo to 3.0.3.

Browse Source 
Possible fix for ONOS-4206.

Change-Id: I6782559b294297f6d929bda49ca6c0fc982cd672
This commit is contained in:
Jonathan Hart 2016-03-25 11:14:29 -07:00
parent bd80447045
commit aa20d61c30
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/features.xml
View File

@ -40,11 +40,11 @@
<bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.2</bundle> <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.2</bundle>
<bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle> <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
<bundle>mvn:com.esotericsoftware/kryo/3.0.0</bundle> <bundle>mvn:com.esotericsoftware/kryo/3.0.3</bundle>
<bundle>mvn:com.esotericsoftware/reflectasm/1.11.0</bundle> <bundle>mvn:com.esotericsoftware/reflectasm/1.11.0</bundle>
<bundle>mvn:org.ow2.asm/asm/4.2</bundle> <bundle>mvn:org.ow2.asm/asm/4.2</bundle>
<bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle> <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
<bundle>mvn:org.objenesis/objenesis/2.1</bundle> <bundle>mvn:org.objenesis/objenesis/2.2</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.0</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.7.0</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.0</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.0</bundle>

2
pom.xml
View File

@ -308,7 +308,7 @@
<dependency> <dependency>
<groupId>com.esotericsoftware</groupId> <groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId> <artifactId>kryo</artifactId>
<version>3.0.0</version> <version>3.0.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.esotericsoftware</groupId> <groupId>com.esotericsoftware</groupId>

25
utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
View File

@ -15,17 +15,6 @@
*/ */
package org.onlab.util; package org.onlab.util;
import static org.slf4j.LoggerFactory.getLogger;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger;
import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.ByteBufferInput; import com.esotericsoftware.kryo.io.ByteBufferInput;
@ -36,6 +25,17 @@ import com.esotericsoftware.kryo.pool.KryoFactory;
import com.esotericsoftware.kryo.pool.KryoPool; import com.esotericsoftware.kryo.pool.KryoPool;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.commons.lang3.tuple.Pair;
import org.objenesis.strategy.StdInstantiatorStrategy;
import org.slf4j.Logger;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import static org.slf4j.LoggerFactory.getLogger;
/** /**
* Pool of Kryo instances, with classes pre-registered. * Pool of Kryo instances, with classes pre-registered.
@ -381,6 +381,9 @@ public final class KryoNamespace implements KryoFactory, KryoPool {
public Kryo create() { public Kryo create() {
Kryo kryo = new Kryo(); Kryo kryo = new Kryo();
kryo.setRegistrationRequired(registrationRequired); kryo.setRegistrationRequired(registrationRequired);
// TODO rethink whether we want to use StdInstantiatorStrategy
kryo.setInstantiatorStrategy(
new Kryo.DefaultInstantiatorStrategy(new StdInstantiatorStrategy()));
for (RegistrationBlock block : registeredBlocks) { for (RegistrationBlock block : registeredBlocks) {
int id = block.begin(); int id = block.begin();
if (id == FLOATING_ID) { if (id == FLOATING_ID) {