src/share/classes/com/sun/tools/javac/comp/Infer.java

changeset 298
3ac205ad1f05
parent 229
03bcd66bd8e7
child 299
22872b24d38c
     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Tue Jun 16 10:45:42 2009 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Tue Jun 16 10:46:16 2009 +0100
     1.3 @@ -158,8 +158,7 @@
     1.4                  that.inst = types.glb(that.hibounds);
     1.5          }
     1.6          if (that.inst == null ||
     1.7 -            that.inst.isErroneous() ||
     1.8 -            !types.isSubtypeUnchecked(that.inst, that.hibounds, warn))
     1.9 +            that.inst.isErroneous())
    1.10              throw ambiguousNoInstanceException
    1.11                  .setMessage("no.unique.maximal.instance.exists",
    1.12                              that.qtype, that.hibounds);

mercurial