From 1dd190f06dfe0abfd41bca55d9bf9f6bc4110d78 Mon Sep 17 00:00:00 2001 From: Kevin Walls Date: Tue, 26 Nov 2024 10:21:44 +0000 Subject: [PATCH] tidyup --- .../modelmbean/RequiredModelMBean.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java index c6b617098c09d..f15a8bee2b354 100644 --- a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java +++ b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java @@ -958,13 +958,11 @@ public Object invoke(String opName, Object[] opArgs, String[] sig) if (opClassName != null) { try { - final Object obj = targetObject; - final String className = opClassName; final ClassNotFoundException[] caughtException = new ClassNotFoundException[1]; - final ClassLoader targetClassLoader = obj.getClass().getClassLoader(); + final ClassLoader targetClassLoader = targetObject.getClass().getClassLoader(); try { - targetClass = Class.forName(className, false, targetClassLoader); + targetClass = Class.forName(opClassName, false, targetClassLoader); } catch (ClassNotFoundException e) { caughtException[0] = e; } @@ -1095,15 +1093,14 @@ private Method findRMMBMethod(String opMethodName, if (opClassName == null) targetClass = rmmbClass; else { - final String className = opClassName; final ClassLoader targetClassLoader = rmmbClass.getClassLoader(); try { - Class clz = Class.forName(className, false, - targetClassLoader); - if (!rmmbClass.isAssignableFrom(clz)) + Class clz = Class.forName(opClassName, false, targetClassLoader); + if (!rmmbClass.isAssignableFrom(clz)) { targetClass = null; - else + } else { targetClass = clz; + } } catch (ClassNotFoundException e) { } } @@ -2607,7 +2604,7 @@ private Class loadClass(final String className) final ClassLoaderRepository clr = getClassLoaderRepository(); try { if (clr == null) throw new ClassNotFoundException(className); - return clr.loadClass(className); + return clr.loadClass(className); } catch (ClassNotFoundException ex) { caughtException[0] = ex; }