Bump POM version, check for recursion in ApplicationWeaver

vsilaev · vsilaev · commit 5d4c1c4378c2 · 2019-02-26T14:37:52.000+03:00
diff --git a/net.tascalate.javaflow.api/pom.xml b/net.tascalate.javaflow.api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.providers.asm3/pom.xml b/net.tascalate.javaflow.providers.asm3/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.providers.asm4/pom.xml b/net.tascalate.javaflow.providers.asm4/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.providers.asm5/pom.xml b/net.tascalate.javaflow.providers.asm5/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.providers.asmx/pom.xml b/net.tascalate.javaflow.providers.asmx/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.spi/pom.xml b/net.tascalate.javaflow.spi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.ant/pom.xml b/net.tascalate.javaflow.tools.ant/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml b/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.jar/pom.xml b/net.tascalate.javaflow.tools.jar/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.javaagent/pom.xml b/net.tascalate.javaflow.tools.javaagent/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.maven/pom.xml b/net.tascalate.javaflow.tools.maven/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.runtime/pom.xml b/net.tascalate.javaflow.tools.runtime/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>net.tascalate.javaflow</groupId>
 		<artifactId>net.tascalate.javaflow.parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.6.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/net.tascalate.javaflow.tools.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ApplicationWeaver.java b/net.tascalate.javaflow.tools.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ApplicationWeaver.java
@@ -28,6 +28,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.commons.javaflow.spi.ResourceTransformationFactory;
 
@@ -145,12 +147,18 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
             return false;
         }
         
+        if (null != CURRENT_INITIATOR.get()) {
+            // In recursion, without exception it will be infinite
+            throw new IllegalStateException("Class " + originalClass.getName() + " is not instrumented, probably it has no continuable methods");
+        }
+        
         try {
             ContinuableClassLoader.Builder builder = new ContinuableClassLoader.Builder(factory);
             if (null == continuablePackageRoots || continuablePackageRoots.isEmpty()) {
                 builder.parentFirst(false);
             } else {
-                for (String s : continuablePackageRoots) {
+                Set<String> filteredPackageRoots = new HashSet<String>(continuablePackageRoots);
+                for (String s : filteredPackageRoots) {
                     if ("*".equals(s)) {
                         s = originalClass.getPackage().getName();
                     }
@@ -159,16 +167,11 @@ private static boolean _trampoline(ResourceTransformationFactory factory,
             }
             ContinuableClassLoader loader = builder.parent(originalLoader).create();
             
-            ClassLoader prev = CURRENT_INITIATOR.get();
             CURRENT_INITIATOR.set(loader);
             try {
                 run(loader, originalClass.getName(), "main", args);
             } finally {
-                if (null == prev) {
-                    CURRENT_INITIATOR.remove();
-                } else {
-                    CURRENT_INITIATOR.set(prev);
-                }
+                CURRENT_INITIATOR.remove();
             }
         }
         catch (RuntimeException ex) { 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>net.tascalate.javaflow</groupId>
 	<artifactId>net.tascalate.javaflow.parent</artifactId>
-	<version>2.5.0</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Tascalate JavFlow</name>
