Kaynağa Gözat

changes getDefinedPackage back to getPackage when Java is < 9.

tags/rel_3_23_0_ga
chibash 6 yıl önce
ebeveyn
işleme
b86c148882
3 değiştirilmiş dosya ile 13 ekleme ve 2 silme
  1. 3
    1
      build.xml
  2. BIN
      javassist.jar
  3. 10
    1
      src/main/javassist/Loader.java

+ 3
- 1
build.xml Dosyayı Görüntüle

<path id="test.compile.classpath"> <path id="test.compile.classpath">
<pathelement location="${build.classes.dir}"/> <pathelement location="${build.classes.dir}"/>
<pathelement location="${lib.dir}/junit.jar"/> <pathelement location="${lib.dir}/junit.jar"/>
<pathelement location="${lib.dir}/hamcrest.jar"/>
</path> </path>


<property name="test.compile.classpath" refid="test.compile.classpath"/> <property name="test.compile.classpath" refid="test.compile.classpath"/>
<path id="test.classpath"> <path id="test.classpath">
<pathelement location="${test.build.dir}"/> <pathelement location="${test.build.dir}"/>
<pathelement location="${lib.dir}/junit.jar"/> <pathelement location="${lib.dir}/junit.jar"/>
<pathelement location="${build.classes.dir}"/>
<pathelement location="${lib.dir}/hamcrest.jar"/>
<pathelement location="${build.classes.dir}"/>
</path> </path>


<property name="test.classpath" refid="test.classpath"/> <property name="test.classpath" refid="test.classpath"/>

BIN
javassist.jar Dosyayı Görüntüle


+ 10
- 1
src/main/javassist/Loader.java Dosyayı Görüntüle

import java.util.Hashtable; import java.util.Hashtable;
import java.util.Vector; import java.util.Vector;


import javassist.bytecode.ClassFile;

/** /**
* The class loader for Javassist. * The class loader for Javassist.
* *
int i = name.lastIndexOf('.'); int i = name.lastIndexOf('.');
if (i != -1) { if (i != -1) {
String pname = name.substring(0, i); String pname = name.substring(0, i);
if (getDefinedPackage(pname) == null)
if (isDefinedPackage(pname))
try { try {
definePackage( definePackage(
pname, null, null, null, null, null, null, null); pname, null, null, null, null, null, null, null);
return defineClass(name, classfile, 0, classfile.length, domain); return defineClass(name, classfile, 0, classfile.length, domain);
} }


private boolean isDefinedPackage(String name) {
if (ClassFile.MAJOR_VERSION >= ClassFile.JAVA_9)
return getDefinedPackage(name) == null;
else
return getPackage(name) == null;
}

protected Class<?> loadClassByDelegation(String name) protected Class<?> loadClassByDelegation(String name)
throws ClassNotFoundException throws ClassNotFoundException
{ {

Loading…
İptal
Kaydet