diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-23 16:52:03 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-08-23 17:00:11 +0200 |
commit | 6dfdfe1f67e21c77b6c4bb0e42b864d1f79790bc (patch) | |
tree | 2385939f887af85a4bd559119ba271f9bfc46b86 | |
parent | c2a5b7fdcfaeb41dbf5c5e25d0813240b3a8715c (diff) | |
parent | d999d12ad02e142cb4464fab3722b9a72e7ae0ee (diff) | |
download | jgit-6dfdfe1f67e21c77b6c4bb0e42b864d1f79790bc.tar.gz jgit-6dfdfe1f67e21c77b6c4bb0e42b864d1f79790bc.zip |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Prepare 5.1.11-SNAPSHOT builds
JGit v5.1.10.201908230655-r
Use AtomicReferences to cache user and system level configs
Fix copy-paste typo in CloneCommand#cleanup
Change-Id: I3ababc0f9b540cf1785925395d32a85d30aed40d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
5 files changed, 27 insertions, 28 deletions
diff --git a/org.eclipse.jgit.lfs.server/.settings/.api_filters b/org.eclipse.jgit.lfs.server/.settings/.api_filters index 72beb7cdfa..45fbf3b8c1 100644 --- a/org.eclipse.jgit.lfs.server/.settings/.api_filters +++ b/org.eclipse.jgit.lfs.server/.settings/.api_filters @@ -3,7 +3,7 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="5.3.3"/> + <message_argument value="5.3.4"/> <message_argument value="5.3.0"/> </message_arguments> </filter> diff --git a/org.eclipse.jgit.lfs/.settings/.api_filters b/org.eclipse.jgit.lfs/.settings/.api_filters index 371f35376d..47219799be 100644 --- a/org.eclipse.jgit.lfs/.settings/.api_filters +++ b/org.eclipse.jgit.lfs/.settings/.api_filters @@ -3,7 +3,7 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="5.3.3"/> + <message_argument value="5.3.4"/> <message_argument value="5.3.0"/> </message_arguments> </filter> diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index bb37dd8c8a..686fb21812 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -3,7 +3,7 @@ <resource path="META-INF/MANIFEST.MF"> <filter id="924844039"> <message_arguments> - <message_argument value="5.3.3"/> + <message_argument value="5.3.4"/> <message_argument value="5.3.0"/> </message_arguments> </filter> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java index 0248ba2793..9f63d0f005 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java @@ -713,7 +713,7 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> { FileUtils.delete(gitDir, FileUtils.RECURSIVE | FileUtils.SKIP_MISSING | FileUtils.IGNORE_ERRORS); } else { - deleteChildren(directory); + deleteChildren(gitDir); } } } catch (IOException e) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 0f8c248f9c..f99aa80e50 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -56,6 +56,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; import java.util.TimeZone; +import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.CorruptObjectException; @@ -97,9 +98,9 @@ public abstract class SystemReader { private static class Default extends SystemReader { private volatile String hostname; - private volatile FileBasedConfig systemConfig; + private AtomicReference<FileBasedConfig> systemConfig = new AtomicReference<>(); - private volatile FileBasedConfig userConfig; + private volatile AtomicReference<FileBasedConfig> userConfig = new AtomicReference<>(); @Override public String getenv(String variable) { @@ -113,10 +114,13 @@ public abstract class SystemReader { @Override public FileBasedConfig openSystemConfig(Config parent, FS fs) { - if (systemConfig == null) { - systemConfig = createSystemConfig(parent, fs); + FileBasedConfig c = systemConfig.get(); + if (c == null) { + systemConfig.compareAndSet(null, + createSystemConfig(parent, fs)); + c = systemConfig.get(); } - return systemConfig; + return c; } protected FileBasedConfig createSystemConfig(Config parent, FS fs) { @@ -142,40 +146,35 @@ public abstract class SystemReader { @Override public FileBasedConfig openUserConfig(Config parent, FS fs) { - if (userConfig == null) { - File home = fs.userHome(); - userConfig = new FileBasedConfig(parent, - new File(home, ".gitconfig"), fs); //$NON-NLS-1$ + FileBasedConfig c = userConfig.get(); + if (c == null) { + userConfig.compareAndSet(null, new FileBasedConfig(parent, + new File(fs.userHome(), ".gitconfig"), fs)); //$NON-NLS-1$ + c = userConfig.get(); } - return userConfig; + return c; } @Override public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException { - if (systemConfig == null) { - systemConfig = createSystemConfig(null, FS.DETECTED); - } - if (systemConfig.isOutdated()) { + FileBasedConfig c = openSystemConfig(null, FS.DETECTED); + if (c.isOutdated()) { LOG.debug("loading system config {}", systemConfig); //$NON-NLS-1$ - systemConfig.load(); + c.load(); } - return systemConfig; + return c; } @Override public StoredConfig getUserConfig() throws IOException, ConfigInvalidException { - if (userConfig == null) { - userConfig = openUserConfig(getSystemConfig(), FS.DETECTED); - } else { - getSystemConfig(); - } - if (userConfig.isOutdated()) { + FileBasedConfig c = openUserConfig(getSystemConfig(), FS.DETECTED); + if (c.isOutdated()) { LOG.debug("loading user config {}", userConfig); //$NON-NLS-1$ - userConfig.load(); + c.load(); } - return userConfig; + return c; } @Override |