1 files changed, 48 insertions, 37 deletions
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcherTransplants.java b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcherTransplants.java
index f50e6987..ea72f56a 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcherTransplants.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcherTransplants.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
@@ -55,44 +56,54 @@ public class EclipseLoaderPatcherTransplants {
 			Field shadowLoaderField = original.getClass().getField("lombok$shadowLoader");
 			ClassLoader shadowLoader = (ClassLoader) shadowLoaderField.get(original);
 			if (shadowLoader == null) {
-				String jarLoc = (String) original.getClass().getField("lombok$location").get(null);
-				JarFile jf = new JarFile(jarLoc);
-				InputStream in = null;
-				try {
-					ZipEntry entry = jf.getEntry("lombok/launch/ShadowClassLoader.class");
-					in = jf.getInputStream(entry);
-					byte[] bytes = new byte[65536];
-					int len = 0;
-					while (true) {
-						int r = in.read(bytes, len, bytes.length - len);
-						if (r == -1) break;
-						len += r;
-						if (len == bytes.length) throw new IllegalStateException("lombok.launch.ShadowClassLoader too large.");
+				synchronized ("lombok$shadowLoader$globalLock".intern()) {
+					shadowLoader = (ClassLoader) shadowLoaderField.get(original);
+					if (shadowLoader == null) {
+						Class shadowClassLoaderClass = (Class) original.getClass().getField("lombok$shadowLoaderClass").get(null);
+						Class classLoaderClass = Class.forName("java.lang.ClassLoader");
+						String jarLoc = (String) original.getClass().getField("lombok$location").get(null);
+						if (shadowClassLoaderClass == null) {
+							JarFile jf = new JarFile(jarLoc);
+							InputStream in = null;
+							try {
+								ZipEntry entry = jf.getEntry("lombok/launch/ShadowClassLoader.class");
+								in = jf.getInputStream(entry);
+								byte[] bytes = new byte[65536];
+								int len = 0;
+								while (true) {
+									int r = in.read(bytes, len, bytes.length - len);
+									if (r == -1) break;
+									len += r;
+									if (len == bytes.length) throw new IllegalStateException("lombok.launch.ShadowClassLoader too large.");
+								}
+								in.close();
+								{
+									Class[] paramTypes = new Class[4];
+									paramTypes[0] = "".getClass();
+									paramTypes[1] = new byte[0].getClass();
+									paramTypes[2] = Integer.TYPE;
+									paramTypes[3] = paramTypes[2];
+									Method defineClassMethod = classLoaderClass.getDeclaredMethod("defineClass", paramTypes);
+									defineClassMethod.setAccessible(true);
+									shadowClassLoaderClass = (Class) defineClassMethod.invoke(original, new Object[] {"lombok.launch.ShadowClassLoader", bytes, new Integer(0), new Integer(len)});
+									original.getClass().getField("lombok$shadowLoaderClass").set(null, shadowClassLoaderClass);
+								}
+							} finally {
+								if (in != null) in.close();
+								jf.close();
+							}
+						}
+						Class[] paramTypes = new Class[5];
+						paramTypes[0] = classLoaderClass;
+						paramTypes[1] = "".getClass();
+						paramTypes[2] = paramTypes[1];
+						paramTypes[3] = Class.forName("java.util.List");
+						paramTypes[4] = paramTypes[3];
+						Constructor constructor = shadowClassLoaderClass.getDeclaredConstructor(paramTypes);
+						constructor.setAccessible(true);
+						shadowLoader = (ClassLoader) constructor.newInstance(new Object[] {original, "lombok", jarLoc, Arrays.asList(new Object[] {"lombok."}), Arrays.asList(new Object[] {"lombok.patcher.Symbols"})});
+						shadowLoaderField.set(original, shadowLoader);
 					}
-					in.close();
-					Class classLoaderClass = Class.forName("java.lang.ClassLoader");
-					Class shadowClassLoaderClass; {
-						Class[] paramTypes = new Class[4];
-						paramTypes[0] = "".getClass();
-						paramTypes[1] = new byte[0].getClass();
-						paramTypes[2] = Integer.TYPE;
-						paramTypes[3] = paramTypes[2];
-						Method defineClassMethod = classLoaderClass.getDeclaredMethod("defineClass", paramTypes);
-						defineClassMethod.setAccessible(true);
-						shadowClassLoaderClass = (Class) defineClassMethod.invoke(original, new Object[] {"lombok.launch.ShadowClassLoader", bytes, new Integer(0), new Integer(len)});
-					}
-					Class[] paramTypes = new Class[4];
-					paramTypes[0] = classLoaderClass;
-					paramTypes[1] = "".getClass();
-					paramTypes[2] = paramTypes[1];
-					paramTypes[3] = new String[0].getClass();
-					Constructor constructor = shadowClassLoaderClass.getDeclaredConstructor(paramTypes);
-					constructor.setAccessible(true);
-					shadowLoader = (ClassLoader) constructor.newInstance(new Object[] {original, "lombok", jarLoc, new String[] {"lombok."}});
-					shadowLoaderField.set(original, shadowLoader);
-				} finally {
-					if (in != null) in.close();
-					jf.close();
 				}
 			}