Skip to content

Commit 19d666a

Browse files
committed
Move CRaCMXBeanImpl and export jdk.crac.management
Issue #20587 Signed-off-by: Peter Shipton <[email protected]>
1 parent 9464ff3 commit 19d666a

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ static void registerAll() {
775775
.validateAndRegister();
776776

777777
/*[IF CRAC_SUPPORT]*/
778-
create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance())
778+
create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance())
779779
.addInterface(jdk.crac.management.CRaCMXBean.class)
780780
.validateAndRegister();
781781
/*[ENDIF] CRAC_SUPPORT */

jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public final class PlatformMBeanProvider extends sun.management.spi.PlatformMBea
112112
}
113113

114114
/*[IF CRAC_SUPPORT]*/
115-
ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$
115+
ComponentBuilder.create(jdk.crac.management.CRaCMXBean.CRAC_MXBEAN_NAME, jdk.crac.management.internal.CRaCMXBeanImpl.getInstance()) // $NON-NLS-1$
116116
.addInterface(jdk.crac.management.CRaCMXBean.class)
117117
.register(allComponents);
118118
/*[ENDIF] CRAC_SUPPORT */

jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBean.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package jdk.crac.management;
2424

2525
import java.lang.management.PlatformManagedObject;
26+
import jdk.crac.management.internal.CRaCMXBeanImpl;
2627

2728
/**
2829
* A management interface of the CRaC functionality in the Java virtual machine.

jcl/src/jdk.management/share/classes/jdk/crac/management/CRaCMXBeanImpl.java renamed to jcl/src/jdk.management/share/classes/jdk/crac/management/internal/CRaCMXBeanImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
*
2121
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2222
*/
23-
package jdk.crac.management;
23+
package jdk.crac.management.internal;
2424

2525
import java.util.concurrent.TimeUnit;
2626
import javax.management.MalformedObjectNameException;
2727
import javax.management.ObjectName;
28+
import jdk.crac.management.CRaCMXBean;
2829
import openj9.internal.criu.InternalCRIUSupport;
2930

3031
/**

jcl/src/jdk.management/share/classes/module-info.java.extra

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*/
2323

2424
exports com.ibm.lang.management;
25-
exports openj9.lang.management;
2625
exports com.ibm.virtualization.management;
26+
exports jdk.crac.management;
27+
exports openj9.lang.management;
2728
provides sun.management.spi.PlatformMBeanProvider with com.ibm.lang.management.internal.PlatformMBeanProvider;

0 commit comments

Comments
 (0)