archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2020-01-28 07:25:31 +01:00
commit efa4d2f9e1
15 changed files with 597 additions and 597 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/java.base/share/classes/java/io/ObjectInputFilter.java
View file

@ -206,11 +206,10 @@ public interface ObjectInputFilter {
* <p>
* The filter is configured during the initialization of the {@code ObjectInputFilter.Config}
* class. For example, by calling {@link #getSerialFilter() Config.getSerialFilter}.
* If the system property {@systemProperty jdk.serialFilter} is defined on the command line,
* it is used to configure the filter.
* If the system property is not defined on the command line, and the
* {@link java.security.Security} property {@code jdk.serialFilter} is defined
* then it is used to configure the filter.
* If the Java virtual machine is started with the system property
* {@systemProperty jdk.serialFilter}, its value is used to configure the filter.
* If the system property is not defined, and the {@link java.security.Security} property
* {@code jdk.serialFilter} is defined then it is used to configure the filter.
* Otherwise, the filter is not configured during initialization and
* can be set with {@link #setSerialFilter(ObjectInputFilter) Config.setSerialFilter}.
* Setting the {@code jdk.serialFilter} with {@link System#setProperty(String, String)

4
src/java.base/share/classes/java/util/stream/package-info.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020, 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
@ -176,7 +176,7 @@
* do:
*
* <pre>{@code
* int sumOfWeights = widgets.}<code><b>parallelStream()</b></code>{@code
* int sumOfWeights = widgets.<b>parallelStream()</b>
* .filter(b -> b.getColor() == RED)
* .mapToInt(b -> b.getWeight())
* .sum();