#62564 - replace Thread.currentThread().getContextClassLoader() with getClass().getCl...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1836590 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
index 6a16e3f9dc53fd1e650732d75b31ae49216489f1..4a984929b6bc5e9cce18dc25dffc3c849dd0e281 100644 (file)
--- a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
+++ b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
@@ -324,7 +324,7 @@ public class CryptoFunctions {
         }
         
         try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            ClassLoader cl = CryptoFunctions.class.getClassLoader();
             String bcProviderName = "org.bouncycastle.jce.provider.BouncyCastleProvider";
             Class<Provider> clazz = (Class<Provider>)cl.loadClass(bcProviderName);
             Security.addProvider(clazz.newInstance());

diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java b/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
index c70105fb93d2c267f9faba0f08311ad227267981..df08b3cf5b3f380943bf1625990ab63dac19cf00 100644 (file)
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
+++ b/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
@@ -217,7 +217,7 @@ public class EncryptionInfo implements Cloneable {
      */
     protected static EncryptionInfoBuilder getBuilder(EncryptionMode encryptionMode)
     throws ClassNotFoundException, IllegalAccessException, InstantiationException {
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader cl = EncryptionInfo.class.getClassLoader();
         EncryptionInfoBuilder eib;
         eib = (EncryptionInfoBuilder)cl.loadClass(encryptionMode.builder).newInstance();
         return eib;

diff --git a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java b/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
index 2d3764e8a2f1c197d4adfdfa8d0320ae89d7add9..fcca6d07a7ffaa13cb308aafd451afd868a84d7f 100644 (file)
--- a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
+++ b/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
@@ -72,7 +72,7 @@ public class DrawPictureShape extends DrawSimpleShape {
             try {
                 @SuppressWarnings("unchecked")
                 Class<? extends ImageRenderer> irc = (Class<? extends ImageRenderer>)
-                    Thread.currentThread().getContextClassLoader().loadClass(WMF_IMAGE_RENDERER);
+                        DrawPictureShape.class.getClassLoader().loadClass(WMF_IMAGE_RENDERER);
                 return irc.newInstance();
             } catch (Exception e) {
                 // WMF image renderer is not on the classpath, continuing with BitmapRenderer

diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
index 31c669cf03dcbd300daa4eef8530efec48cf144b..7f4ab04b2949245800a967d74bb3146da5135cd8 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
+++ b/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
@@ -292,7 +292,7 @@ public class SlideShowFactory {
         P extends TextParagraph<S,P,? extends TextRun>
     > SlideShow<S,P> createSlideShow(String factoryClass, Object args[]) throws IOException, EncryptedDocumentException {
         try {
-            Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(factoryClass);
+            Class<?> clazz = SlideShowFactory.class.getClassLoader().loadClass(factoryClass);
             Class<?> argsClz[] = new Class<?>[args.length];
             int i=0;
             for (Object o : args) {

diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
index d62fdfc85f53257b7f80910e7e3da3b1e9789604..7ac79673407c432aff20525feb12cd9c2f6de200 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
+++ b/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
@@ -294,7 +294,7 @@ public class WorkbookFactory {
 
     private static Workbook createWorkbook(String factoryClass, Object args[]) throws IOException, EncryptedDocumentException {
         try {
-            Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(factoryClass);
+            Class<?> clazz = WorkbookFactory.class.getClassLoader().loadClass(factoryClass);
             Class<?> argsClz[] = new Class<?>[args.length];
             int i=0;
             for (Object o : args) {

diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java b/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
index 056ecbb8e96c8cac013f14fffae989d2d8254fd5..393e474468fa5d6c7eea4a56d39782b4c1fbc852 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
@@ -356,8 +356,7 @@ public final class TestPOIXMLDocument {
             }
         };
 
-        Thread thread = Thread.currentThread();
-        ClassLoader cl = thread.getContextClassLoader();
+        ClassLoader cl = getClass().getClassLoader();
         UncaughtHandler uh = new UncaughtHandler();
         
         // check schema type loading and check if we could run in an OOM

diff --git a/src/resources/devtools/forbidden-signatures.txt b/src/resources/devtools/forbidden-signatures.txt
index 2ea708740c31f19e63c6ca83176b63f5d4fafe88..e64d7e02cf73f53a8e777fb3cc3b2f91eeb91de9 100644 (file)
--- a/src/resources/devtools/forbidden-signatures.txt
+++ b/src/resources/devtools/forbidden-signatures.txt
@@ -79,8 +79,9 @@ java.net.InetAddress#getCanonicalHostName()
 \r
 java.net.InetSocketAddress#getHostName() @ Use getHostString() instead, which avoids a DNS lookup\r
 \r
-@defaultMessage this method needs special permission\r
-java.lang.Thread#getAllStackTraces()\r
+\r
+java.lang.Thread#getAllStackTraces() @ this method needs special permission\r
+java.lang.Thread#getContextClassLoader() @ use getClass().getClassLoader() instead of getContextClassLoader() (see https://stackoverflow.com/a/36228195/2066598)\r
 \r
 @defaultMessage Avoid unchecked warnings by using Collections#empty(List|Map|Set) methods\r
 java.util.Collections#EMPTY_LIST\r

diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
index 205f3e6e527682699a53c5d3af41ed4aedec0862..0b28c76f074f45f4c338bf177dcf479199b49627 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
@@ -75,7 +75,7 @@ public class HSLFMetroShape<T extends Shape<?,?>> {
         }
         
         // org.apache.poi.xslf.usermodel.XSLFMetroShape
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader cl = getClass().getClassLoader();
         try {
             Class<?> ms = cl.loadClass("org.apache.poi.xslf.usermodel.XSLFMetroShape");
             Method m = ms.getMethod("parseShape", byte[].class);