--- old/src/java.management/share/classes/javax/management/MBeanOperationInfo.java 2017-10-26 13:50:42.721549000 +0530 +++ new/src/java.management/share/classes/javax/management/MBeanOperationInfo.java 2017-10-26 13:50:42.469549000 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -146,6 +146,9 @@ * @param descriptor The descriptor for the operation. This may be null * which is equivalent to an empty descriptor. * + * @throws IllegalArgumentException if {@code impact} is not one of {@code + * ACTION}, {@code ACTION_INFO}, {@code INFO}, or {@code UNKNOWN}. + * * @since 1.6 */ public MBeanOperationInfo(String name, @@ -157,6 +160,13 @@ super(name, description, descriptor); + if (impact != ACTION && impact != ACTION_INFO && impact != INFO + && impact != UNKNOWN) { + throw new IllegalArgumentException("Argument impact can only be " + + "one of ACTION, ACTION_INFO, " + + "INFO, or UNKNOWN: " + impact); + } + if (signature == null || signature.length == 0) signature = MBeanParameterInfo.NO_PARAMS; else @@ -254,13 +264,12 @@ @Override public String toString() { - String impactString; + String impactString = ""; switch (getImpact()) { case ACTION: impactString = "action"; break; case ACTION_INFO: impactString = "action/info"; break; case INFO: impactString = "info"; break; case UNKNOWN: impactString = "unknown"; break; - default: impactString = "(" + getImpact() + ")"; } return getClass().getName() + "[" + "description=" + getDescription() + ", " + --- /dev/null 2017-10-24 14:57:19.736000000 +0530 +++ new/test/jdk/javax/management/mxbean/MBeanOperationInfoImpactRangeTest.java 2017-10-26 13:50:43.085549000 +0530 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + /* + * @test + * @bug 8024352 + * @modules java.management + * @run main MBeanOperationInfoImpactRangeTest + * @summary Check that MBeanOperationInfo throws an IllegalArgumentException when impact + * value is not among INFO,ACTION,ACTION_INFO,UNKNOWN + */ +import javax.management.MBeanOperationInfo; + +public class MBeanOperationInfoImpactRangeTest { + + public static void main(String Args[]) { + + int impactValue; + + // valid range for impact is {INFO=0,ACTION=1,ACTION_INFO=2,UNKNOWN=3} + /* MBeanOperationInfo should throw IllegalArgumentException when impact + value is given out of range*/ + System.out.println("checking that no exception is thrown when a " + + "value in range is passed"); + MBeanOperationInfo mbi = new MBeanOperationInfo("IRC", "impact Range" + + " check", null, null, MBeanOperationInfo.ACTION); + impactValue = mbi.getImpact(); + System.out.println("given value is " + impactValue); + System.out.println("Success no exception thrown"); + + try { + System.out.println("checking that exception is thrown when a value" + + " out of range is passed"); + mbi = new MBeanOperationInfo("IRC", "impact Range" + + " check", null, null, 5); + impactValue = mbi.getImpact(); + System.out.println("IllegalArgumentException not thrown" + + " when a value out of range is passed ," + + " given value is " + impactValue); + throw new RuntimeException("Test failed !!"); + // throwing RuntimeException for notifying the unusual behaviour + } catch (IllegalArgumentException e) { + System.out.println("IllegalArgumentException thrown as expected, " + + "illegal value given as impact"); + System.out.println("success"); + } + } +} \ No newline at end of file