Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #565 from alevandoski/master 

AMQ-8011 - Performance Related issue in ClassLoadingAwareObjectInputS…
This commit is contained in:
Jean-Baptiste Onofré 2020-11-21 19:05:54 +01:00 committed by GitHub
parent a3a3e5e108 f3e0ab4c5a
commit 02d4f8efec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-client/src/main/java/org/apache/activemq/util/ClassLoadingAwareObjectInputStream.java
View File

@ -98,11 +98,15 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream {
}
private void checkSecurity(Class clazz) throws ClassNotFoundException {
if (!clazz.isPrimitive()) {
if (clazz.getPackage() != null && !trustAllPackages()) {
if (trustAllPackages() || clazz.isPrimitive()) {
return;
}
boolean found = false;
for (String packageName : getTrustedPackages()) {
if (clazz.getPackage().getName().equals(packageName) || clazz.getPackage().getName().startsWith(packageName + ".")) {
Package thePackage = clazz.getPackage();
if (thePackage != null) {
for (String trustedPackage : getTrustedPackages()) {
if (thePackage.getName().equals(trustedPackage) || thePackage.getName().startsWith(trustedPackage + ".")) {
found = true;
break;
}
@ -112,7 +116,6 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream {
}
}
}
}
private Class<?> load(String className, ClassLoader... cl) throws ClassNotFoundException {
// check for simple types first