karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject [karaf] branch master updated: [KARAF-6238] Synchronized access to config.properties when downloading custom distro's libraries
Date Mon, 15 Apr 2019 11:10:01 GMT
This is an automated email from the ASF dual-hosted git repository.

ggrzybek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 24eb7a7  [KARAF-6238] Synchronized access to config.properties when downloading custom
distro's libraries
24eb7a7 is described below

commit 24eb7a7b0992fd9e0570e4621fdd27572e3b0114
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
AuthorDate: Mon Apr 15 12:34:38 2019 +0200

    [KARAF-6238] Synchronized access to config.properties when downloading custom distro's
libraries
---
 .../org/apache/karaf/profile/assembly/Builder.java | 69 +++++++++++-----------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index a48da2d..272b547 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -52,9 +52,7 @@ import java.util.TreeSet;
 import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.BiPredicate;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import java.util.regex.Pattern;
@@ -1568,42 +1566,44 @@ public class Builder {
             default:                     path = "lib"; break;
             }
             downloader.download(library, provider -> {
-                    synchronized (provider) {
-                        Path input = provider.getFile().toPath();
-                        String name = filename != null ? filename : input.getFileName().toString();
-                        Path libOutput = homeDirectory.resolve(path).resolve(name);
-                        if (!libOutput.toFile().getParentFile().isDirectory()) {
-                            libOutput.toFile().getParentFile().mkdirs();
-                        }
-                        LOGGER.info("{}   adding library: {}", indent, homeDirectory.relativize(libOutput));
-                        Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
-                        if (provider.getUrl().startsWith("mvn:")) {
-                            // copy boot library in system repository
-                            if (type.equals(Library.TYPE_BOOT)) {
-                                String mvnPath = Parser.pathFromMaven(provider.getUrl());
-                                Path sysOutput = systemDirectory.resolve(mvnPath);
-                                Files.createDirectories(sysOutput.getParent());
-                                Files.copy(input, sysOutput, StandardCopyOption.REPLACE_EXISTING);
-                                libOutput = homeDirectory.resolve(path).resolve(name);
-                                // copy the file
-                                LOGGER.info("{}   adding maven library: {}", indent, provider.getUrl());
-                                Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
-                                /* a symlink could be used instead
-
-                                if (Files.notExists(libOutput, LinkOption.NOFOLLOW_LINKS))
{
-                                    try {
-                                        Files.createSymbolicLink(libOutput, libOutput.getParent().relativize(sysOutput));
-                                    } catch (FileSystemException e) {
-                                        Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
-                                    }
+                synchronized (downloader) {
+                    Path input = provider.getFile().toPath();
+                    String name = filename != null ? filename : input.getFileName().toString();
+                    Path libOutput = homeDirectory.resolve(path).resolve(name);
+                    if (!libOutput.toFile().getParentFile().isDirectory()) {
+                        libOutput.toFile().getParentFile().mkdirs();
+                    }
+                    LOGGER.info("{}   adding library: {}", indent, homeDirectory.relativize(libOutput));
+                    Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
+                    if (provider.getUrl().startsWith("mvn:")) {
+                        // copy boot library in system repository
+                        if (type.equals(Library.TYPE_BOOT)) {
+                            String mvnPath = Parser.pathFromMaven(provider.getUrl());
+                            Path sysOutput = systemDirectory.resolve(mvnPath);
+                            Files.createDirectories(sysOutput.getParent());
+                            Files.copy(input, sysOutput, StandardCopyOption.REPLACE_EXISTING);
+                            libOutput = homeDirectory.resolve(path).resolve(name);
+                            // copy the file
+                            LOGGER.info("{}   adding maven library: {}", indent, provider.getUrl());
+                            Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
+                            /* a symlink could be used instead
+
+                            if (Files.notExists(libOutput, LinkOption.NOFOLLOW_LINKS)) {
+                                try {
+                                    Files.createSymbolicLink(libOutput, libOutput.getParent().relativize(sysOutput));
+                                } catch (FileSystemException e) {
+                                    Files.copy(input, libOutput, StandardCopyOption.REPLACE_EXISTING);
                                 }
-                                */
                             }
+                            */
                         }
                     }
-                    boolean export = Boolean.parseBoolean(clause.getDirective(LIBRARY_CLAUSE_EXPORT));
-                    boolean delegate = Boolean.parseBoolean(clause.getDirective(LIBRARY_CLAUSE_DELEGATE));
-                    if (export || delegate) {
+                }
+                boolean export = Boolean.parseBoolean(clause.getDirective(LIBRARY_CLAUSE_EXPORT));
+                boolean delegate = Boolean.parseBoolean(clause.getDirective(LIBRARY_CLAUSE_DELEGATE));
+
+                if (export || delegate) {
+                    synchronized (config) {
                         Map<String, String> headers = getHeaders(provider);
                         String packages = headers.get(Constants.EXPORT_PACKAGE);
                         if (packages != null) {
@@ -1624,6 +1624,7 @@ public class Builder {
                             }
                         }
                     }
+                }
             });
         }
     }


Mime
View raw message