Browse Source

Merge pull request #308 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0

* commit '95c8250148661cf3386053174e317d4bc1d57198':
  KERNEL-1322 fine-jodd支持JDK11
  KERNEL-1305 fine-cglib支持JDK11
research/11.0
zhouping 5 years ago
parent
commit
9f92685f63
  1. 8
      fine-cglib/src/com/fr/third/net/sf/cglib/reflect/MethodDelegate.java
  2. 2
      fine-jodd/src/com/fr/third/jodd/exception/ExceptionUtil.java

8
fine-cglib/src/com/fr/third/net/sf/cglib/reflect/MethodDelegate.java

@ -15,9 +15,6 @@
*/ */
package com.fr.third.net.sf.cglib.reflect; package com.fr.third.net.sf.cglib.reflect;
import java.lang.reflect.*;
import java.security.ProtectionDomain;
import com.fr.third.net.sf.cglib.core.AbstractClassGenerator; import com.fr.third.net.sf.cglib.core.AbstractClassGenerator;
import com.fr.third.net.sf.cglib.core.ClassEmitter; import com.fr.third.net.sf.cglib.core.ClassEmitter;
import com.fr.third.net.sf.cglib.core.CodeEmitter; import com.fr.third.net.sf.cglib.core.CodeEmitter;
@ -28,11 +25,12 @@ import com.fr.third.net.sf.cglib.core.MethodInfo;
import com.fr.third.net.sf.cglib.core.ReflectUtils; import com.fr.third.net.sf.cglib.core.ReflectUtils;
import com.fr.third.net.sf.cglib.core.Signature; import com.fr.third.net.sf.cglib.core.Signature;
import com.fr.third.net.sf.cglib.core.TypeUtils; import com.fr.third.net.sf.cglib.core.TypeUtils;
import com.fr.third.net.sf.cglib.*;
import com.fr.third.net.sf.cglib.core.*;
import com.fr.third.org.objectweb.asm.ClassVisitor; import com.fr.third.org.objectweb.asm.ClassVisitor;
import com.fr.third.org.objectweb.asm.Type; import com.fr.third.org.objectweb.asm.Type;
import java.lang.reflect.Method;
import java.security.ProtectionDomain;
// TODO: don't require exact match for return type // TODO: don't require exact match for return type
/** /**

2
fine-jodd/src/com/fr/third/jodd/exception/ExceptionUtil.java

@ -255,7 +255,7 @@ public class ExceptionUtil {
if (throwable instanceof RuntimeException) { if (throwable instanceof RuntimeException) {
throw (RuntimeException) throwable; throw (RuntimeException) throwable;
} }
Thread.currentThread().stop(throwable); throw new UnsupportedOperationException();
} }
/** /**

Loading…
Cancel
Save