Mercurial > hg > release > icedtea7-forest-2.0 > corba
changeset 319:7839048ec99e
Merge
author | jeff |
---|---|
date | Fri, 27 May 2011 15:27:52 -0700 |
parents | 643f267ca234 (current diff) 93e77c49b3bb (diff) |
children | 77ec0541aa2a |
files | |
diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.