Skip to content

Commit e63149c

Browse files
wenshaowenshao
committed
support custom classLoader
1 parent 1c19710 commit e63149c

File tree

4 files changed

+35
-16
lines changed

4 files changed

+35
-16
lines changed

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
-->
1212
<groupId>com.alibaba</groupId>
1313
<artifactId>fastjson</artifactId>
14-
<version>1.1.37</version>
14+
<version>1.1.38-SNAPSHOT</version>
1515

1616
<packaging>jar</packaging>
1717
<name>fastjson</name>
@@ -23,7 +23,7 @@
2323
<properties>
2424
<junit.version>4.11</junit.version>
2525

26-
<gpg.skip>false</gpg.skip>
26+
<gpg.skip>true</gpg.skip>
2727
<javadoc.skip>false</javadoc.skip>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<jdk.version>1.5</jdk.version>

‎src/main/java/com/alibaba/fastjson/parser/ParserConfig.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,17 @@ public static ParserConfig getGlobalInstance() {
148148

149149
protected final SymbolTable symbolTable = new SymbolTable();
150150

151-
public ParserConfig(){
151+
protected ASMDeserializerFactory asmFactory = ASMDeserializerFactory.getInstance();
152+
153+
public ParserConfig() {
154+
this(ASMDeserializerFactory.getInstance());
155+
}
156+
157+
public ParserConfig(ClassLoader parentClassLoader){
158+
this(new ASMDeserializerFactory(parentClassLoader));
159+
}
160+
161+
public ParserConfig(ASMDeserializerFactory asmFactory){
152162
primitiveClasses.add(boolean.class);
153163
primitiveClasses.add(Boolean.class);
154164

@@ -399,7 +409,7 @@ public ObjectDeserializer createJavaBeanDeserializer(Class<?> clazz, Type type)
399409
asmEnable = false;
400410
}
401411

402-
if (ASMDeserializerFactory.getInstance().isExternalClass(clazz)) {
412+
if (asmFactory.isExternalClass(clazz)) {
403413
asmEnable = false;
404414
}
405415

@@ -446,7 +456,7 @@ public ObjectDeserializer createJavaBeanDeserializer(Class<?> clazz, Type type)
446456
}
447457

448458
try {
449-
return ASMDeserializerFactory.getInstance().createJavaBeanDeserializer(this, clazz, type);
459+
return asmFactory.createJavaBeanDeserializer(this, clazz, type);
450460
// } catch (VerifyError e) {
451461
// e.printStackTrace();
452462
// return new JavaBeanDeserializer(this, clazz, type);
@@ -482,7 +492,7 @@ public FieldDeserializer createFieldDeserializer(ParserConfig mapping, Class<?>
482492
asmEnable = false;
483493
}
484494

485-
if (ASMDeserializerFactory.getInstance().isExternalClass(clazz)) {
495+
if (asmFactory.isExternalClass(clazz)) {
486496
asmEnable = false;
487497
}
488498

@@ -491,7 +501,7 @@ public FieldDeserializer createFieldDeserializer(ParserConfig mapping, Class<?>
491501
}
492502

493503
try {
494-
return ASMDeserializerFactory.getInstance().createFieldDeserializer(mapping, clazz, fieldInfo);
504+
return asmFactory.createFieldDeserializer(mapping, clazz, fieldInfo);
495505
} catch (Throwable e) {
496506
// skip
497507
}

‎src/main/java/com/alibaba/fastjson/parser/deserializer/ASMDeserializerFactory.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242

4343
public class ASMDeserializerFactory implements Opcodes {
4444

45-
private static final ASMDeserializerFactory instance = new ASMDeserializerFactory();
45+
private static final ASMDeserializerFactory instance = new ASMDeserializerFactory();
4646

47-
private ASMClassLoader classLoader = new ASMClassLoader();
47+
private final ASMClassLoader classLoader;
4848

49-
private final AtomicLong seed = new AtomicLong();
49+
private final AtomicLong seed = new AtomicLong();
5050

5151
public String getGenClassName(Class<?> clazz) {
5252
return "Fastjson_ASM_" + clazz.getSimpleName() + "_" + seed.incrementAndGet();
@@ -60,7 +60,11 @@ public String getGenFieldDeserializer(Class<?> clazz, FieldInfo fieldInfo) {
6060
}
6161

6262
public ASMDeserializerFactory(){
63+
classLoader = new ASMClassLoader();
64+
}
6365

66+
public ASMDeserializerFactory(ClassLoader parentClassLoader){
67+
classLoader = new ASMClassLoader(parentClassLoader);
6468
}
6569

6670
public final static ASMDeserializerFactory getInstance() {
@@ -183,9 +187,8 @@ void _deserialzeArrayMapping(ClassWriter cw, Context context) {
183187
mw.visitMethodInsn(INVOKEVIRTUAL, getType(DefaultJSONParser.class), "getSymbolTable",
184188
"()" + getDesc(SymbolTable.class));
185189
mw.visitVarInsn(BIPUSH, seperator);
186-
mw.visitMethodInsn(INVOKEVIRTUAL, getType(JSONLexerBase.class), "scanEnum", "(Ljava/lang/Class;"
187-
+ getDesc(SymbolTable.class)
188-
+ "C)Ljava/lang/Enum;");
190+
mw.visitMethodInsn(INVOKEVIRTUAL, getType(JSONLexerBase.class), "scanEnum",
191+
"(Ljava/lang/Class;" + getDesc(SymbolTable.class) + "C)Ljava/lang/Enum;");
189192
mw.visitTypeInsn(CHECKCAST, getType(fieldClass)); // cast
190193
mw.visitVarInsn(ASTORE, context.var(fieldInfo.getName() + "_asm"));
191194
} else if (Collection.class.isAssignableFrom(fieldClass)) {
@@ -485,7 +488,8 @@ void _deserialze(ClassWriter cw, Context context) {
485488
mw.visitVarInsn(ALOAD, context.var("lexer"));
486489
mw.visitVarInsn(ALOAD, 0);
487490
mw.visitFieldInsn(GETFIELD, context.getClassName(), fieldInfo.getName() + "_asm_prefix__", "[C");
488-
mw.visitMethodInsn(INVOKEVIRTUAL, getType(JSONLexerBase.class), "scanFieldString", "([C)Ljava/lang/String;");
491+
mw.visitMethodInsn(INVOKEVIRTUAL, getType(JSONLexerBase.class), "scanFieldString",
492+
"([C)Ljava/lang/String;");
489493
mw.visitVarInsn(ASTORE, context.var(fieldInfo.getName() + "_asm"));
490494

491495
} else if (fieldClass.isEnum()) {
@@ -656,7 +660,7 @@ private void _isEnable(Context context, MethodVisitor mw, Feature feature) {
656660
mw.visitVarInsn(ALOAD, context.var("lexer"));
657661
mw.visitFieldInsn(GETSTATIC, getType(Feature.class), feature.name(), "L" + getType(Feature.class) + ";");
658662
mw.visitMethodInsn(INVOKEVIRTUAL, getType(JSONLexerBase.class), "isEnabled", "(" + "L" + getType(Feature.class)
659-
+ ";" + ")Z");
663+
+ ";" + ")Z");
660664
}
661665

662666
private void defineVarLexer(Context context, MethodVisitor mw) {
@@ -724,7 +728,8 @@ private void _loadAndSet(Context context, MethodVisitor mw, FieldInfo fieldInfo)
724728
mw.visitVarInsn(ALOAD, context.var("instance"));
725729
mw.visitVarInsn(LLOAD, context.var(fieldInfo.getName() + "_asm", 2));
726730
if (fieldInfo.getMethod() != null) {
727-
mw.visitMethodInsn(INVOKEVIRTUAL, getType(context.getClazz()), fieldInfo.getMethod().getName(), getDesc(fieldInfo.getMethod()));
731+
mw.visitMethodInsn(INVOKEVIRTUAL, getType(context.getClazz()), fieldInfo.getMethod().getName(),
732+
getDesc(fieldInfo.getMethod()));
728733
if (!fieldInfo.getMethod().getReturnType().equals(Void.TYPE)) {
729734
mw.visitInsn(POP);
730735
}

‎src/main/java/com/alibaba/fastjson/util/ASMClassLoader.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public Object run() {
2020
public ASMClassLoader(){
2121
super(getParentClassLoader());
2222
}
23+
24+
public ASMClassLoader(ClassLoader parent){
25+
super (parent);
26+
}
2327

2428
static ClassLoader getParentClassLoader() {
2529
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();

0 commit comments

Comments
 (0)