Simplify how we workaround EOFException and ZipException.

Author: nedtwigg

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/PlugGenerator.kt

@@ -43,7 +43,6 @@ class PlugGenerator internal constructor(toSearches: List<File>, toLinkAgainst:
 	private val metadataGeneratorFor: KFunction<Function<Any, String>>
 
 	init {
-		System.setProperty("atplug.generate", "true")
 		// create a classloader which looks in toSearch first, then each of the jars in toLinkAgainst
 		val urls = (toSearches + toLinkAgainst).map { it.toURI().toURL() }.toTypedArray()
 		val parent: ClassLoader? =
@@ -54,8 +53,8 @@ class PlugGenerator internal constructor(toSearches: List<File>, toLinkAgainst:
 		metadataGeneratorFor =
 				socketOwnerCompanionObject::class.memberFunctions.find {
 					it.name == "metadataGeneratorFor"
-				}!! as
-						KFunction<Function<Any, String>>
+				}!!
+						as KFunction<Function<Any, String>>
 		try {
 			val parser = PlugParser()
 			// walk toSearch, passing each classfile to load()

atplug-runtime/src/main/java/com/diffplug/atplug/PlugRegistry.kt

@@ -58,6 +58,11 @@ interface PlugRegistry {
 						// do the parsing again but this time disable caching
 						// https://stackoverflow.com/questions/36517604/closing-a-jarurlconnection
 						parseManifest(manifestUrl, false)
+					} catch (e: ZipException) {
+						// When a JVM loads a jar, it mmaps the jar. If that jar changes
+						// (as it does when generating plugin metadata in a Gradle daemon)
+						// then you sometimes get ZipException after the change.
+						parseManifest(manifestUrl, false)
 					}
 				}
 			}
@@ -77,26 +82,12 @@ interface PlugRegistry {
 					for (service in
 							services.split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()) {
 						val servicePath = service.trim { it <= ' ' }
-						try {
-							if (servicePath.isNotEmpty()) {
-								val asString = manifestUrl.toExternalForm()
-								val component = parseComponent(asString, servicePath, allowCaching)
-								synchronized(this) {
-									data.putDescriptor(component.provides, component)
-									owners[component.provides]?.doRegister(component)
-								}
-							}
-						} catch (e: ZipException) {
-							// When a JVM loads a jar, it mmaps the jar. If that jar changes
-							// (as it does when generating plugin metadata in a Gradle daemon)
-							// then you get ZipException after the change. The accuracy of the
-							// registry is irrelevant during metadata generation - the registry
-							// exists during metadata generation only because the `SocketOwner`s
-							// register themselves in their constructors. Therefore, it is safe to
-							// ignore these errors during metadata generation.
-							val prop = System.getProperty("atplug.generate")
-							if (prop != "true") {
-								throw e
+						if (servicePath.isNotEmpty()) {
+							val asString = manifestUrl.toExternalForm()
+							val component = parseComponent(asString, servicePath, allowCaching)
+							synchronized(this) {
+								data.putDescriptor(component.provides, component)
+								owners[component.provides]?.doRegister(component)
 							}
 						}
 					}