Merge

Fri, 27 May 2011 15:27:52 -0700

author
jeff
date
Fri, 27 May 2011 15:27:52 -0700
changeset 283
7839048ec99e
parent 282
643f267ca234
parent 281
93e77c49b3bb
child 284
77ec0541aa2a

Merge

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Fri May 27 14:58:44 2011 -0700
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java	Fri May 27 15:27:52 2011 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -405,8 +405,7 @@
    1.11          if (!serializable ||
    1.12              externalizable ||
    1.13              forProxyClass ||
    1.14 -            name.equals("java.lang.String") ||
    1.15 -            isEnum) {
    1.16 +            name.equals("java.lang.String")){
    1.17              fields = NO_FIELDS;
    1.18          } else if (serializable) {
    1.19              /* Ask for permission to override field access checks.

mercurial