aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2018-07-17 22:32:24 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2018-07-17 22:36:32 +0200
commita195a47337f592eb117f519f7a1a42f0d8f570d1 (patch)
tree7b9a30568735d3a3afb10dd30a67c7118c3ac682 /src
parent0375f1a9e8f606588d4e136fc718a6876ff0ae4f (diff)
downloadlombok-a195a47337f592eb117f519f7a1a42f0d8f570d1.tar.gz
lombok-a195a47337f592eb117f519f7a1a42f0d8f570d1.tar.bz2
lombok-a195a47337f592eb117f519f7a1a42f0d8f570d1.zip
Attempting to fix issues with integration with mapstruct; issue #1359
Diffstat (limited to 'src')
-rw-r--r--src/launch/lombok/launch/ShadowClassLoader.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/launch/lombok/launch/ShadowClassLoader.java b/src/launch/lombok/launch/ShadowClassLoader.java
index 36dd289c..32363469 100644
--- a/src/launch/lombok/launch/ShadowClassLoader.java
+++ b/src/launch/lombok/launch/ShadowClassLoader.java
@@ -526,9 +526,14 @@ class ShadowClassLoader extends ClassLoader {
String fileNameOfClass = name.replace(".", "/") + ".class";
URL res = getResource_(fileNameOfClass, true);
if (res == null) {
- if (!exclusionListMatch(fileNameOfClass)) return super.loadClass(name, resolve);
- throw new ClassNotFoundException(name);
+ if (!exclusionListMatch(fileNameOfClass)) try {
+ return super.loadClass(name, resolve);
+ } catch (ClassNotFoundException cnfe) {
+ res = getResource_("secondaryLoading.SCL." + sclSuffix + "/" + name.replace(".", "/") + ".SCL." + sclSuffix, true);
+ if (res == null) throw cnfe;
+ }
}
+ if (res == null) throw new ClassNotFoundException(name);
byte[] b;
int p = 0;