RFR: 8290740: Catalog not used when the handler is null

[Joe Wang]

Patch to make sure the Catalog is used even when the handler is null.

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

Commit messages:
 - 8290740: Catalog not used when the handler is null

Changes: https://git.openjdk.org/jdk/pull/9682/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=9682&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8290740
  Stats: 76 lines in 3 files changed: 22 ins; 9 del; 45 mod
  Patch: https://git.openjdk.org/jdk/pull/9682.diff
  Fetch: git fetch https://git.openjdk.org/jdk pull/9682/head:pull/9682

PR: https://git.openjdk.org/jdk/pull/9682