Fixed a generics-related bug reported in #207, hopefully without intr…

…oducing a new one.
EsotericSoftware · Apr 3, 2014 · 6ebf7bb · 6ebf7bb
1 parent c2c75cc
commit 6ebf7bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/com/esotericsoftware/kryo/Generics.java b/src/com/esotericsoftware/kryo/Generics.java
@@ -53,6 +53,10 @@ public void setParentScope (Generics scope) {
  public Generics getParentScope () {
  return parentScope;
  }
+
+ public Map<String, Class> getMappings() {
+ return typeVar2class;
+ }
 
  public String toString () {
  return typeVar2class.toString();

diff --git a/src/com/esotericsoftware/kryo/Kryo.java b/src/com/esotericsoftware/kryo/Kryo.java
@@ -1131,6 +1131,9 @@ static final class DefaultSerializerEntry {
  public void pushGenericsScope (Class type, Generics generics) {
  if (TRACE) trace("kryo", "Settting a new generics scope for class " + type.getName() + ": " + generics);
  Generics currentScope = genericsScope;
+ if (generics.getParentScope() != null) {
+ generics = new Generics(generics.getMappings());
+ }
  genericsScope = generics;
  genericsScope.setParentScope(currentScope);
  }