Merge

src/share/classes/java/io/SerialCallbackContext.java

-  /*
-   * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-   * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * Copyright (c) 2006, 2012, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
-  package java.io;
+package java.io;
 
-  /**
+/**
  * Context during upcalls from object stream to class-defined
  * readObject/writeObject methods.
  * Holds object currently being deserialized and descriptor for current class.
@@ -16,7 +36,7 @@
  * readObject/writeObject method has returned.
  * If not set to the current thread, the getObj method throws NotActiveException.
  */
-  final class SerialCallbackContext {
+final class SerialCallbackContext {
     private final Object obj;
     private final ObjectStreamClass desc;
     /**
@@ -51,4 +71,4 @@
     public void setUsed() {
         thread = null;
     }
-  }
+}