store downloads first in temp file and then rename and load maven dow…

…nloads again in parallel
lucee · Dec 20, 2024 · 5ae46f5 · 5ae46f5
1 parent 0c1ef20
commit 5ae46f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/java/lucee/runtime/mvn/MavenUtil.java b/core/src/main/java/lucee/runtime/mvn/MavenUtil.java
@@ -381,16 +381,18 @@ public static void download(POM pom, Collection<Repository> repositories, String
 								if (entity != null) {
 									Exception ex = null;
 									InputStream is = null;
+									Resource tmp = SystemUtil.getTempFile(type, false);
 									try {
 										is = entity.getContent();
-										IOUtil.copy(is, res, false);
+										IOUtil.copy(is, tmp, false);
 									}
 									catch (IOException e) {
 										ex = e;
 									}
 									finally {
 										IOUtil.closeEL(is);
-										HTTPUtil.validateDownload(url, response, res, true, ex);
+										HTTPUtil.validateDownload(url, response, tmp, true, ex);
+										tmp.moveTo(res);
 									}
 								}
 							}

diff --git a/core/src/main/java/lucee/runtime/mvn/POM.java b/core/src/main/java/lucee/runtime/mvn/POM.java
@@ -466,7 +466,7 @@ public List<POM> getAllDependencies() throws IOException {
 		return list;
 	}
 
-	private static TreeNode<POM> getDependencies(POM pom, boolean recursive, int level, TreeNode<POM> node) throws IOException {
+	private static TreeNode<POM> getDependenciesSerial(POM pom, boolean recursive, int level, TreeNode<POM> node) throws IOException {
 		try {
 			List<POM> deps = pom.getDependencies();
 			if (deps != null) {
@@ -491,7 +491,7 @@ private static TreeNode<POM> getDependencies(POM pom, boolean recursive, int lev
 		}
 	}
 
-	private static TreeNode<POM> getDependenciesAsync(POM pom, boolean recursive, int level, TreeNode<POM> node) throws IOException {
+	private static TreeNode<POM> getDependencies(POM pom, boolean recursive, int level, TreeNode<POM> node) throws IOException {
 		ExecutorService executor = null;
 		try {
 			List<POM> deps = pom.getDependencies();

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.239-SNAPSHOT"/>
+  <property name="version" value="6.2.0.240-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.239-SNAPSHOT</version>
+  <version>6.2.0.240-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>