From: Christian Melchior Date: Mon, 13 Nov 2017 10:24:57 +0000 (+0100) Subject: Fix merge mistake X-Git-Tag: rel_3_23_0_ga~3^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c90af6769e50aae20894250099708a2456b7ea1c;p=javassist.git Fix merge mistake --- diff --git a/src/main/javassist/ClassPoolTail.java b/src/main/javassist/ClassPoolTail.java index ebbfff99..2ab8ee46 100644 --- a/src/main/javassist/ClassPoolTail.java +++ b/src/main/javassist/ClassPoolTail.java @@ -179,7 +179,6 @@ final class JarClassPath implements ClassPath { return null; // not found } - @Override @Override public String toString() { return jarfileURL == null ? "" : jarfileURL.toString(); diff --git a/src/main/javassist/scopedpool/ScopedClassPool.java b/src/main/javassist/scopedpool/ScopedClassPool.java index bcda0ded..1a7029c0 100644 --- a/src/main/javassist/scopedpool/ScopedClassPool.java +++ b/src/main/javassist/scopedpool/ScopedClassPool.java @@ -118,7 +118,6 @@ public class ScopedClassPool extends ClassPool { */ public void close() { this.removeClassPath(classPath); - classPath.close(); classes.clear(); softcache.clear(); }