Enable spotbugs in mdsal-binding-spec-util

[mdsal.git] / binding / mdsal-binding-spec-util / src / main / java / org / opendaylight / mdsal / binding / spec / reflect / StringValueObjectFactory.java

diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/StringValueObjectFactory.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/StringValueObjectFactory.java
index 41328d5469d911cdde396c8c5caabf73b79f7e17..ac281ca986e2409dc4d6ef71446e4a78fb4ee967 100644 (file)
--- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/StringValueObjectFactory.java
+++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/StringValueObjectFactory.java
@@ -17,6 +17,8 @@ import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,8 +77,6 @@ public final class StringValueObjectFactory<T> {
         }
 
         final Field f = findValueField(clazz);
-        f.setAccessible(true);
-
         final StringValueObjectFactory<T> ret;
         try {
             ret = new StringValueObjectFactory<>(template,
@@ -113,17 +113,24 @@ public final class StringValueObjectFactory<T> {
     private static Field findValueField(final Class<?> orig) {
         NoSuchFieldException cause = null;
         Class<?> clazz = orig;
-        do {
+        while (clazz != null) {
+            final Field f;
             try {
-                return clazz.getDeclaredField("_value");
+                f = clazz.getDeclaredField("_value");
             } catch (NoSuchFieldException e) {
                 if (cause != null) {
                     e.addSuppressed(cause);
                 }
                 cause = e;
+                clazz = clazz.getSuperclass();
+                continue;
             }
-            clazz = clazz.getSuperclass();
-        } while (clazz != null);
+
+            return AccessController.doPrivileged((PrivilegedAction<Field>) () -> {
+                f.setAccessible(true);
+                return f;
+            });
+        }
 
         throw new IllegalArgumentException(orig + " nor its superclasses define required internal field _value", cause);
     }