[JENKINS-37566] - JBoss magic should really fail if we cannot mark fi…

…elds as accessible
jenkinsci · Oct 25, 2016 · 574a815 · 574a815
1 parent 408bc16
commit 574a815
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/main/java/hudson/remoting/Which.java b/src/main/java/hudson/remoting/Which.java
@@ -144,26 +144,21 @@ public static File jarFile(Class clazz) throws IOException {
                 Object delegate = is;
                 while (delegate.getClass().getEnclosingClass()!=ZipFile.class) {
                     Field f = delegate.getClass().getDeclaredField("delegate");
-                    if (!ReflectionUtils.makeAccessibleOrLog(f, LOGGER, Level.FINE)) {
-                        continue;
-                    }
+                    ReflectionUtils.makeAccessible(f);
 
                     delegate = f.get(delegate);
                     //JENKINS-5922 - workaround for CertificateReaderInputStream; JBoss 5.0.0, EAP 5.0 and EAP 5.1
                     if(delegate.getClass().getName().equals("java.util.jar.JarVerifier$VerifierStream")){
                         f = delegate.getClass().getDeclaredField("is");
-                        if (!ReflectionUtils.makeAccessibleOrLog(f, LOGGER, Level.FINE)) {
-                            continue;
-                        }
+                        ReflectionUtils.makeAccessible(f);
                         delegate = f.get(delegate);
                     }
                 }
                 Field f = delegate.getClass().getDeclaredField("this$0");
-                if (ReflectionUtils.makeAccessibleOrLog(f, LOGGER, Level.FINE)) {
-                    ZipFile zipFile = (ZipFile)f.get(delegate);
-                    return new File(zipFile.getName());
-                } // Else fall through till alternative actions or exception
-            } catch (NoSuchFieldException e) {
+                ReflectionUtils.makeAccessible(f);
+                ZipFile zipFile = (ZipFile)f.get(delegate);
+                return new File(zipFile.getName());
+            } catch (NoSuchFieldException | PrivilegedActionException e) {
                 // something must have changed in JBoss5. fall through
                 LOGGER.log(Level.FINE, "Failed to resolve vfszip into a jar location",e);
             } catch (IllegalAccessException e) {