changeset 1416:b75fc6019d5f

6852574: EnumPersistenceDelegate fails to persist instances with blocks Reviewed-by: peterz
author malenkov
date Wed, 24 Jun 2009 13:59:54 +0400
parents ce347002bbd9
children 404a13b063f9
files src/share/classes/java/beans/MetaData.java test/java/beans/XMLEncoder/Test6852574.java
diffstat 2 files changed, 59 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/beans/MetaData.java	Tue Jun 23 12:24:11 2009 +0400
+++ b/src/share/classes/java/beans/MetaData.java	Wed Jun 24 13:59:54 2009 +0400
@@ -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()});
     }
 }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/beans/XMLEncoder/Test6852574.java	Wed Jun 24 13:59:54 2009 +0400
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6852574
+ * @summary Tests Enum subclass encoding
+ * @author Sergey Malenkov
+ */
+
+public final class Test6852574 extends AbstractTest {
+    public static void main(String[] args) {
+        new Test6852574().test(true);
+    }
+
+    protected Object getObject() {
+        return Data.FIRST;
+    }
+
+    protected Object getAnotherObject() {
+        return Data.SECOND;
+    }
+
+    public enum Data {
+        FIRST {
+            @Override
+            public String toString() {
+                return "1";
+            }
+        },
+        SECOND {
+            @Override
+            public String toString() {
+                return "2";
+            }
+        }
+    }
+}