1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Flow.java Mon Apr 04 19:36:26 2011 +0100 1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed Apr 06 19:30:57 2011 -0700 1.3 @@ -381,7 +381,7 @@ 1.4 if (sym.adr >= firstadr && trackable(sym)) { 1.5 if ((sym.flags() & FINAL) != 0) { 1.6 if ((sym.flags() & PARAMETER) != 0) { 1.7 - if ((sym.flags() & DISJUNCTION) != 0) { //multi-catch parameter 1.8 + if ((sym.flags() & UNION) != 0) { //multi-catch parameter 1.9 log.error(pos, "multicatch.parameter.may.not.be.assigned", 1.10 sym); 1.11 } 1.12 @@ -1003,7 +1003,7 @@ 1.13 thrown = List.nil(); 1.14 for (List<JCCatch> l = tree.catchers; l.nonEmpty(); l = l.tail) { 1.15 List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ? 1.16 - ((JCTypeDisjunction)l.head.param.vartype).alternatives : 1.17 + ((JCTypeUnion)l.head.param.vartype).alternatives : 1.18 List.of(l.head.param.vartype); 1.19 for (JCExpression ct : subClauses) { 1.20 caught = chk.incl(ct.type, caught); 1.21 @@ -1075,7 +1075,7 @@ 1.22 alive = true; 1.23 JCVariableDecl param = l.head.param; 1.24 List<JCExpression> subClauses = TreeInfo.isMultiCatch(l.head) ? 1.25 - ((JCTypeDisjunction)l.head.param.vartype).alternatives : 1.26 + ((JCTypeUnion)l.head.param.vartype).alternatives : 1.27 List.of(l.head.param.vartype); 1.28 List<Type> ctypes = List.nil(); 1.29 List<Type> rethrownTypes = chk.diff(thrownInTry, caughtInTry);