src/java.base/share/classes/java/io/ObjectInputStream.java
changeset 53304 9e968a576dd2
parent 52427 3c6aa484536c
child 55198 30fe07cac527
child 58678 9cf78a70fa4f
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java	Tue Jan 15 21:17:35 2019 +0100
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java	Tue Jan 15 15:56:41 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -188,7 +188,7 @@
  * the classes, array lengths, number of references in the stream, depth, and
  * number of bytes consumed from the input stream are allowed and
  * if not, can terminate deserialization.
- * A {@linkplain ObjectInputFilter.Config#setSerialFilter(ObjectInputFilter) process-wide filter}
+ * A {@linkplain ObjectInputFilter.Config#setSerialFilter(ObjectInputFilter) system-wide filter}
  * can be configured that is applied to each {@code ObjectInputStream} unless replaced
  * using {@link #setObjectInputFilter(ObjectInputFilter) setObjectInputFilter}.
  *
@@ -322,7 +322,7 @@
      * has written and flushed the header.
      *
      * <p>The serialization filter is initialized to the value of
-     * {@linkplain ObjectInputFilter.Config#getSerialFilter() the process-wide filter}.
+     * {@linkplain ObjectInputFilter.Config#getSerialFilter() the system-wide filter}.
      *
      * <p>If a security manager is installed, this constructor will check for
      * the "enableSubclassImplementation" SerializablePermission when invoked
@@ -357,7 +357,7 @@
      * implementation of ObjectInputStream.
      *
      * <p>The serialization filter is initialized to the value of
-     * {@linkplain ObjectInputFilter.Config#getSerialFilter() the process-wide filter}.
+     * {@linkplain ObjectInputFilter.Config#getSerialFilter() the system-wide filter}.
      *
      * <p>If there is a security manager installed, this method first calls the
      * security manager's <code>checkPermission</code> method with the
@@ -1157,7 +1157,7 @@
      * Returns the serialization filter for this stream.
      * The serialization filter is the most recent filter set in
      * {@link #setObjectInputFilter setObjectInputFilter} or
-     * the initial process-wide filter from
+     * the initial system-wide filter from
      * {@link ObjectInputFilter.Config#getSerialFilter() ObjectInputFilter.Config.getSerialFilter}.
      *
      * @return the serialization filter for the stream; may be null
@@ -1233,7 +1233,7 @@
      * @throws SecurityException if there is security manager and the
      *       {@code SerializablePermission("serialFilter")} is not granted
      * @throws IllegalStateException if the {@linkplain #getObjectInputFilter() current filter}
-     *       is not {@code null} and is not the process-wide filter
+     *       is not {@code null} and is not the system-wide filter
      * @since 9
      */
     public final void setObjectInputFilter(ObjectInputFilter filter) {
@@ -1241,7 +1241,7 @@
         if (sm != null) {
             sm.checkPermission(ObjectStreamConstants.SERIAL_FILTER_PERMISSION);
         }
-        // Allow replacement of the process-wide filter if not already set
+        // Allow replacement of the system-wide filter if not already set
         if (serialFilter != null &&
                 serialFilter != ObjectInputFilter.Config.getSerialFilter()) {
             throw new IllegalStateException("filter can not be set more than once");