diff -r 0b2f54e47bc4 -r 1afc4675dc75 jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java
--- a/jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java	Thu Jul 31 11:48:39 2014 -0700
+++ b/jdk/src/share/classes/sun/tools/tree/ConditionalExpression.java	Thu Jul 31 17:01:24 2014 -0700
@@ -64,7 +64,7 @@
     /**
      * Check the expression
      */
-    public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable exp) {
+    public Vset checkValue(Environment env, Context ctx, Vset vset, Hashtable<Object, Object> exp) {
         ConditionVars cvars = cond.checkCondition(env, ctx, vset, exp);
         vset = left.checkValue(env, ctx, cvars.vsTrue, exp).join(
                right.checkValue(env, ctx, cvars.vsFalse, exp) );
@@ -107,7 +107,7 @@
         return vset;
     }
 
-    public Vset check(Environment env, Context ctx, Vset vset, Hashtable exp) {
+    public Vset check(Environment env, Context ctx, Vset vset, Hashtable<Object, Object> exp) {
         vset = cond.checkValue(env, ctx, vset, exp);
         cond = convert(env, ctx, Type.tBoolean, cond);
         return left.check(env, ctx, vset.copy(), exp).join(right.check(env, ctx, vset, exp));