From a3946e30e34206b16edb4bb702779519a50b4ad2 Mon Sep 17 00:00:00 2001 From: Harold Seigel Date: Fri, 13 Jan 2017 10:45:53 -0500 Subject: [PATCH] 8172288: Fix Jigsaw related module/package error messages and throw correct exceptions Reword error messages and throw IllegalStateExceptions where appropriate Reviewed-by: alanb, acorn, lfoltan, gtriantafill --- .../share/classes/java/lang/reflect/Layer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java index 4b4588c3c01..9eaf90d0ca8 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2017, 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 @@ -458,7 +458,7 @@ public final class Layer { loader.initRemotePackageMap(cf, parents); Layer layer = new Layer(cf, parents, mn -> loader); return new Controller(layer); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException | IllegalStateException e) { throw new LayerInstantiationException(e.getMessage()); } } @@ -526,7 +526,7 @@ public final class Layer { try { Layer layer = new Layer(cf, parents, pool::loaderFor); return new Controller(layer); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException | IllegalStateException e) { throw new LayerInstantiationException(e.getMessage()); } } @@ -610,9 +610,8 @@ public final class Layer { try { Layer layer = new Layer(cf, parents, clf); return new Controller(layer); - } catch (IllegalArgumentException iae) { - // IAE is thrown by VM when defining the module fails - throw new LayerInstantiationException(iae.getMessage()); + } catch (IllegalArgumentException | IllegalStateException e) { + throw new LayerInstantiationException(e.getMessage()); } }