--- old/src/share/classes/com/sun/tools/javac/comp/Resolve.java	2013-05-07 13:02:04.529072796 -0400
+++ new/src/share/classes/com/sun/tools/javac/comp/Resolve.java	2013-05-07 13:02:04.374071817 -0400
@@ -1852,6 +1852,7 @@
         Symbol bestSoFar = typeNotFound;
         Symbol sym;
         boolean staticOnly = false;
+        Symbol staticError = null;
         for (Env<AttrContext> env1 = env; env1.outer != null; env1 = env1.outer) {
             if (isStatic(env1)) staticOnly = true;
             for (Scope.Entry e = env1.info.scope.lookup(name);
@@ -1860,8 +1861,9 @@
                 if (e.sym.kind == TYP) {
                     if (staticOnly &&
                         e.sym.type.hasTag(TYPEVAR) &&
-                        e.sym.owner.kind == TYP) return new StaticError(e.sym);
-                    return e.sym;
+                        e.sym.owner.kind == TYP) staticError = e.sym;
+                    else
+                        return e.sym;
                 }
             }
 
@@ -1880,6 +1882,8 @@
             if ((encl.sym.flags() & STATIC) != 0)
                 staticOnly = true;
         }
+        if (staticError != null)
+            return new StaticError(staticError);
 
         if (!env.tree.hasTag(IMPORT)) {
             sym = findGlobalType(env, env.toplevel.namedImportScope, name);