hg: lambda/defender-prototype: Handle the case where a class inherits from both a parameterized generic type and an erased generic type. With test and improved error message.

[robert.field at oracle.com]

Changeset: c4167d43e4c3
Author:    Robert Field <Robert.Field at oracle.com>
Date:      2011-08-19 13:26 -0700
URL:       http://hg.openjdk.java.net/lambda/defender-prototype/rev/c4167d43e4c3

Handle the case where a class inherits from both a parameterized generic type and an erased generic type. With test and improved error message.

! src/jsr335/agent/ComputeWeaves.java
! src/jsr335/agent/generic/ClassDType.java
! src/jsr335/agent/generic/TypeVariableMap.java
+ test/jsr335/agent/junit/ErasedGenericTest.java