# HG changeset patch
# User jeff
# Date 1306535272 25200
# Node ID 7839048ec99e31653cea023e9edae9b4b136673b
# Parent  643f267ca234355f9693daf747c56088d7039b2c# Parent  93e77c49b3bb6fa9b8c4aee644533524b3a17bd9
Merge

diff -r 643f267ca234 -r 7839048ec99e src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
--- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Fri May 27 14:58:44 2011 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Fri May 27 15:27:52 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2011, Oracle and/or its affiliates. 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
@@ -405,8 +405,7 @@
         if (!serializable ||
             externalizable ||
             forProxyClass ||
-            name.equals("java.lang.String") ||
-            isEnum) {
+            name.equals("java.lang.String")){
             fields = NO_FIELDS;
         } else if (serializable) {
             /* Ask for permission to override field access checks.