Author: kiwiwings
Date: Tue Jul 24 22:57:18 2018
New Revision: 1836590
URL: http://svn.apache.org/viewvc?rev=1836590&view=rev
Log:
#62564 - replace Thread.currentThread().getContextClassLoader() with
getClass().getClassLoader()
Modified:
poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
poi/trunk/src/resources/devtools/forbidden-signatures.txt
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java Tue Jul
24 22:57:18 2018
@@ -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());
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java Tue Jul
24 22:57:18 2018
@@ -217,7 +217,7 @@ public class EncryptionInfo implements C
*/
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;
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java Tue Jul 24
22:57:18 2018
@@ -72,7 +72,7 @@ public class DrawPictureShape extends Dr
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
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
(original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java Tue
Jul 24 22:57:18 2018
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java Tue Jul
24 22:57:18 2018
@@ -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) {
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
Tue Jul 24 22:57:18 2018
@@ -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
Modified: poi/trunk/src/resources/devtools/forbidden-signatures.txt
URL:
http://svn.apache.org/viewvc/poi/trunk/src/resources/devtools/forbidden-signatures.txt?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/resources/devtools/forbidden-signatures.txt (original)
+++ poi/trunk/src/resources/devtools/forbidden-signatures.txt Tue Jul 24
22:57:18 2018
@@ -79,8 +79,9 @@ java.net.InetAddress#getCanonicalHostNam
java.net.InetSocketAddress#getHostName() @ Use getHostString() instead, which
avoids a DNS lookup
-@defaultMessage this method needs special permission
-java.lang.Thread#getAllStackTraces()
+
+java.lang.Thread#getAllStackTraces() @ this method needs special permission
+java.lang.Thread#getContextClassLoader() @ use getClass().getClassLoader()
instead of getContextClassLoader() (see
https://stackoverflow.com/a/36228195/2066598)
@defaultMessage Avoid unchecked warnings by using
Collections#empty(List|Map|Set) methods
java.util.Collections#EMPTY_LIST
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java?rev=1836590&r1=1836589&r2=1836590&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
Tue Jul 24 22:57:18 2018
@@ -75,7 +75,7 @@ public class HSLFMetroShape<T extends Sh
}
// 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
