diff -r c35b158e2290 -r 6f0ed5a89c25 test/tools/javac/generics/inference/6638712/T6638712b.out
--- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Tue Apr 10 23:19:26 2012 -0700
+++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Wed Apr 11 10:50:11 2012 +0100
@@ -1,2 +1,2 @@
-T6638712b.java:14:21: compiler.err.prob.found.req.1: (compiler.misc.infer.no.conforming.instance.exists: T, T, java.lang.String)
+T6638712b.java:14:21: compiler.err.prob.found.req.1: (compiler.misc.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String,java.lang.Object))
 1 error