Committed by
Gerrit Code Review
Fix registration order in kryo
Change-Id: I051124ecb7bb55276c253af18f0c47df4a68c875
Showing
1 changed file
with
2 additions
and
2 deletions
... | @@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableList; | ... | @@ -20,8 +20,8 @@ import com.google.common.collect.ImmutableList; |
20 | import com.google.common.collect.ImmutableMap; | 20 | import com.google.common.collect.ImmutableMap; |
21 | import com.google.common.collect.ImmutableSet; | 21 | import com.google.common.collect.ImmutableSet; |
22 | import com.google.common.collect.Maps; | 22 | import com.google.common.collect.Maps; |
23 | - | ||
24 | import com.google.common.collect.Sets; | 23 | import com.google.common.collect.Sets; |
24 | + | ||
25 | import org.onlab.packet.ChassisId; | 25 | import org.onlab.packet.ChassisId; |
26 | import org.onlab.packet.EthType; | 26 | import org.onlab.packet.EthType; |
27 | import org.onlab.packet.Ip4Address; | 27 | import org.onlab.packet.Ip4Address; |
... | @@ -249,6 +249,7 @@ public final class KryoNamespaces { | ... | @@ -249,6 +249,7 @@ public final class KryoNamespaces { |
249 | ImmutableMap.of().getClass(), | 249 | ImmutableMap.of().getClass(), |
250 | ImmutableMap.of("a", 1).getClass(), | 250 | ImmutableMap.of("a", 1).getClass(), |
251 | ImmutableMap.of("R", 2, "D", 2).getClass()) | 251 | ImmutableMap.of("R", 2, "D", 2).getClass()) |
252 | + .register(Collections.unmodifiableSet(Collections.emptySet()).getClass()) | ||
252 | .register(HashMap.class) | 253 | .register(HashMap.class) |
253 | .register(ConcurrentHashMap.class) | 254 | .register(ConcurrentHashMap.class) |
254 | .register(CopyOnWriteArraySet.class) | 255 | .register(CopyOnWriteArraySet.class) |
... | @@ -265,7 +266,6 @@ public final class KryoNamespaces { | ... | @@ -265,7 +266,6 @@ public final class KryoNamespaces { |
265 | .register(Collections.emptySet().getClass()) | 266 | .register(Collections.emptySet().getClass()) |
266 | .register(Optional.class) | 267 | .register(Optional.class) |
267 | .register(Collections.emptyList().getClass()) | 268 | .register(Collections.emptyList().getClass()) |
268 | - .register(Collections.unmodifiableSet(Collections.emptySet()).getClass()) | ||
269 | .register(Collections.singleton(Object.class).getClass()) | 269 | .register(Collections.singleton(Object.class).getClass()) |
270 | .build(); | 270 | .build(); |
271 | 271 | ... | ... |
-
Please register or login to post a comment