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

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2023-02-09 11:59:08 +00:00
commit af8973dc50
3 changed files with 60 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,8 +187,11 @@ import static java.lang.System.Logger.Level.ERROR;
*
* This class shows how an application provided filter factory can combine filters
* to check every deserialization operation that takes place in a thread.
* It defines a thread-local variable to hold the thread-specific filter, and constructs a filter factory
* that composes that filter with the static JVM-wide filter and the stream-specific filter.
* It defines a thread-local variable to hold the thread-specific filter, and construct a filter factory
* that composes that filter with the static JVM-wide filter and the stream-specific filter,
* rejecting any classes not handled by those two filters.
* If a stream specific filter is set and does not accept or reject a class,
* the combined JVM-wide filter and thread filter is applied.
* The {@code doWithSerialFilter} method does the setup of the thread-specific filter
* and invokes the application provided {@link Runnable Runnable}.
*
@ -207,26 +210,18 @@ import static java.lang.System.Logger.Level.ERROR;
* // Called from the OIS constructor or perhaps OIS.setObjectInputFilter with no current filter
* var filter = filterThreadLocal.get();
* if (filter != null) {
* // Wrap the filter to reject UNDECIDED results
* filter = ObjectInputFilter.rejectUndecidedClass(filter);
* // Merge to invoke the thread local filter and then the JVM-wide filter (if any)
* filter = ObjectInputFilter.merge(filter, next);
* return ObjectInputFilter.rejectUndecidedClass(filter);
* }
* if (next != null) {
* // Merge the next filter with the thread filter, if any
* // Initially this is the static JVM-wide filter passed from the OIS constructor
* // Wrap the filter to reject UNDECIDED results
* filter = ObjectInputFilter.merge(next, filter);
* filter = ObjectInputFilter.rejectUndecidedClass(filter);
* }
* return filter;
* return (next == null) ? null : ObjectInputFilter.rejectUndecidedClass(next);
* } else {
* // Called from OIS.setObjectInputFilter with a current filter and a stream-specific filter.
* // The curr filter already incorporates the thread filter and static JVM-wide filter
* // and rejection of undecided classes
* // If there is a stream-specific filter wrap it and a filter to recheck for undecided
* // If there is a stream-specific filter merge to invoke it and then the current filter.
* if (next != null) {
* next = ObjectInputFilter.merge(next, curr);
* next = ObjectInputFilter.rejectUndecidedClass(next);
* return next;
* return ObjectInputFilter.merge(next, curr);
* }
* return curr;
* }