--- a/jdk/src/share/classes/java/beans/MetaData.java	Wed Jul 15 10:46:42 2009 -0700
+++ b/jdk/src/share/classes/java/beans/MetaData.java	Tue Jul 21 13:02:23 2009 -0700
@@ -93,7 +93,7 @@
 
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Enum e = (Enum) oldInstance;
-        return new Expression(e, Enum.class, "valueOf", new Object[]{e.getClass(), e.name()});
+        return new Expression(e, Enum.class, "valueOf", new Object[]{e.getDeclaringClass(), e.name()});
     }
 }