changeset 451:9820f99c66fb

6990437: Update with correct copyright info for source and test files from SSR10_02 fixes Reviewed-by: darcy
author asaha
date Thu, 07 Oct 2010 16:32:17 -0700
parents 02b79f1c8c17
children 9ee81cf7f507
files src/share/classes/java/io/SerialCallbackContext.java test/java/io/Serializable/6559775/SerialRace.java test/java/io/Serializable/6559775/SerialVictim.java test/java/io/Serializable/6559775/Test6559775.sh test/java/io/Serializable/6966692/Attack.java test/java/io/Serializable/6966692/Test6966692.sh test/java/io/Serializable/6966692/Victim.java
diffstat 7 files changed, 211 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/io/SerialCallbackContext.java	Tue Oct 05 09:45:11 2010 -0700
+++ b/src/share/classes/java/io/SerialCallbackContext.java	Thu Oct 07 16:32:17 2010 -0700
@@ -1,58 +1,75 @@
-  /*
-   * %W% %E%
-   *
-   * Copyright (c) 2006, 2010  Oracle and/or its affiliates. All rights reserved.
-   * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-   */
+/*
+ * Copyright (c) 2010, 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;
-  
-  /**
-   * Context during upcalls from object stream to class-defined
-   * readObject/writeObject methods. 
-   * Holds object currently being deserialized and descriptor for current class. 
-   *
-   * This context keeps track of the thread it was constructed on, and allows
-   * only a single call of defaultReadObject, readFields, defaultWriteObject 
-   * or writeFields which must be invoked on the same thread before the class's
-   * readObject/writeObject method has returned.
-   * If not set to the current thread, the getObj method throws NotActiveException.
-   */
-  final class SerialCallbackContext {
-      private final Object obj;
-      private final ObjectStreamClass desc;
-      /**
-       * Thread this context is in use by.
-       * As this only works in one thread, we do not need to worry about thread-safety.
-       */
-      private Thread thread;
-  
-      public SerialCallbackContext(Object obj, ObjectStreamClass desc) {
-          this.obj = obj;
-          this.desc = desc;
-          this.thread = Thread.currentThread();
-      }
-  
-      public Object getObj() throws NotActiveException {
-          checkAndSetUsed();
-          return obj;
-      }
-  
-      public ObjectStreamClass getDesc() {
-          return desc;
-      }
-  
-      private void checkAndSetUsed() throws NotActiveException {
-          if (thread != Thread.currentThread()) {
-               throw new NotActiveException(
-                "not in readObject invocation or fields already read");
-          }
-          thread = null;
-      }
-  
-      public void setUsed() {
-          thread = null;
-      }
-  }
-  
+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. 
+ *
+ * This context keeps track of the thread it was constructed on, and allows
+ * only a single call of defaultReadObject, readFields, defaultWriteObject 
+ * or writeFields which must be invoked on the same thread before the class's
+ * readObject/writeObject method has returned.
+ * If not set to the current thread, the getObj method throws NotActiveException.
+ */
+final class SerialCallbackContext {
+    private final Object obj;
+    private final ObjectStreamClass desc;
+    /**
+     * Thread this context is in use by.
+     * As this only works in one thread, we do not need to worry about thread-safety.
+     */
+    private Thread thread;
+
+    public SerialCallbackContext(Object obj, ObjectStreamClass desc) {
+        this.obj = obj;
+        this.desc = desc;
+        this.thread = Thread.currentThread();
+    }
+
+    public Object getObj() throws NotActiveException {
+        checkAndSetUsed();
+        return obj;
+    }
+
+    public ObjectStreamClass getDesc() {
+        return desc;
+    }
+
+    private void checkAndSetUsed() throws NotActiveException {
+        if (thread != Thread.currentThread()) {
+             throw new NotActiveException(
+              "not in readObject invocation or fields already read");
+        }
+        thread = null;
+    }
+
+    public void setUsed() {
+        thread = null;
+    }
+}
+
--- a/test/java/io/Serializable/6559775/SerialRace.java	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6559775/SerialRace.java	Thu Oct 07 16:32:17 2010 -0700
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 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.
+ *
+ * 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.
+ */
+
 /*
  * @test %W% %E%
  * @bug 6559775
--- a/test/java/io/Serializable/6559775/SerialVictim.java	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6559775/SerialVictim.java	Thu Oct 07 16:32:17 2010 -0700
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 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.
+ *
+ * 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.
+ */
+
 /**
  * Instances of this class created through deserialization
  *   should, in theory, be immutable.
--- a/test/java/io/Serializable/6559775/Test6559775.sh	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6559775/Test6559775.sh	Thu Oct 07 16:32:17 2010 -0700
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+##
+## Copyright (c) 2010, 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.
+##
+## 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.
+##
+
 if [ "${TESTSRC}" = "" ]
 then TESTSRC=.
 fi
--- a/test/java/io/Serializable/6966692/Attack.java	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6966692/Attack.java	Thu Oct 07 16:32:17 2010 -0700
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 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.
+ *
+ * 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.
+ */
+
 /*
  * @test
  * @bug 6966692
--- a/test/java/io/Serializable/6966692/Test6966692.sh	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6966692/Test6966692.sh	Thu Oct 07 16:32:17 2010 -0700
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+##
+## Copyright (c) 2010, 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.
+##
+## 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.
+##
+
 if [ "${TESTSRC}" = "" ]
 then TESTSRC=.
 fi
--- a/test/java/io/Serializable/6966692/Victim.java	Tue Oct 05 09:45:11 2010 -0700
+++ b/test/java/io/Serializable/6966692/Victim.java	Thu Oct 07 16:32:17 2010 -0700
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 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.
+ *
+ * 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.
+ */
+
 import java.io.*;
 
 public class Victim implements Serializable {