[jdk17u] RFR: 8275811: Incorrect instance to dispose

[Sean Coffey]

Clean port of JDK-8275811

-------------

Commit messages:
 - Backport cddc6ce44695cba4614c3405eb2b194d7c76489b

Changes: https://git.openjdk.java.net/jdk17u/pull/297/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk17u&pr=297&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8275811
  Stats: 35 lines in 4 files changed: 32 ins; 0 del; 3 mod
  Patch: https://git.openjdk.java.net/jdk17u/pull/297.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk17u pull/297/head:pull/297

PR: https://git.openjdk.java.net/jdk17u/pull/297