From: chibash <chiba@javassist.org>
Date: Tue, 4 Oct 2016 15:51:28 +0000 (+0900)
Subject: Merge branch 'test/java9-jigsaw'
X-Git-Tag: rel_3_22_0_cr1~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fd1b5fa8cdf07a6b153bbc606fe1ab78c2be6c26;p=javassist.git

Merge branch 'test/java9-jigsaw'
---

fd1b5fa8cdf07a6b153bbc606fe1ab78c2be6c26
diff --cc javassist.jar
index 3fb75e6a,20b45c6c..40f6a448
Binary files differ
diff --cc pom.xml
index 49ba6657,6b780fcd..f4390628
--- a/pom.xml
+++ b/pom.xml
@@@ -7,7 -7,7 +7,7 @@@
    	Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation
      simple.  It is a class library for editing bytecodes in Java.
    </description>
-   <version>3.21.0-GA</version>
 -  <version>3.21.0</version>
++  <version>3.22.0-CR1</version>
    <name>Javassist</name>
    <url>http://www.javassist.org/</url>
  
diff --cc src/main/javassist/CtClass.java
index 31e86044,162ce48f..4ff04c0e
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@@ -69,7 -69,7 +69,7 @@@ public abstract class CtClass 
      /**
       * The version number of this release.
       */
-     public static final String version = "3.21.0-GA";
 -    public static final String version = "3.21.0-java9beta2";
++    public static final String version = "3.22.0-CR1";
  
      /**
       * Prints the version number and the copyright notice.
diff --cc src/test/javassist/JvstTest5.java
index c20a85f2,9d22c47c..26474bb7
--- a/src/test/javassist/JvstTest5.java
+++ b/src/test/javassist/JvstTest5.java
@@@ -237,6 -237,12 +237,13 @@@ public class JvstTest5 extends JvstTest
          assertEquals(1, invoke(obj, "run"));
      }
  
+     public void testLoaderClassPath() throws Exception {
+         ClassPool cp = new ClassPool();
+         cp.appendClassPath(new LoaderClassPath(new Loader()));
+         assertNotNull(cp.get(Object.class.getName()));
+         assertNotNull(cp.get(this.getClass().getName()));
++    }
+ 
      public void testAddDefaultMethod() throws Exception {
          CtClass cc = sloader.makeInterface("test5.AddDefaultMethod");
          cc.addMethod(CtNewMethod.make("static int foo() { return 1; }", cc));