You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/03 14:03:09 UTC
[jmeter] branch master updated (17fc0d3 -> add3cc2)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 17fc0d3 Spacepolice
new 353bfb0 Remove useless method call
new d3ab7c6 Check for result of mkdir
new c347493 Use long arithmetic all along
new add3cc2 spelchack
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/core/src/main/java/org/apache/jmeter/gui/action/Save.java | 2 +-
.../org/apache/jmeter/util/PropertiesBasedPrefixResolver.java | 1 -
.../src/main/java/org/apache/jorphan/collections/HashTree.java | 2 +-
.../src/main/java/org/apache/jorphan/util/JOrphanUtils.java | 8 +++++---
4 files changed, 7 insertions(+), 6 deletions(-)
[jmeter] 03/04: Use long arithmetic all along
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit c347493c708c5de4d9ae14ff17885db054afbc47
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 3 16:02:13 2019 +0200
Use long arithmetic all along
---
src/core/src/main/java/org/apache/jmeter/gui/action/Save.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
index 4ee5272..f0d5bf2 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/Save.java
@@ -435,7 +435,7 @@ public class Save extends AbstractAction {
*/
private List<File> expiredBackupFiles(List<File> backupFiles) {
if (BACKUP_MAX_HOURS > 0) {
- final long expiryMillis = System.currentTimeMillis() - (BACKUP_MAX_HOURS * MS_PER_HOUR);
+ final long expiryMillis = System.currentTimeMillis() - (1L * BACKUP_MAX_HOURS * MS_PER_HOUR);
return backupFiles.stream().filter(file -> file.lastModified() < expiryMillis).collect(Collectors.toList());
} else {
return EMPTY_FILE_LIST;
[jmeter] 01/04: Remove useless method call
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 353bfb0ee935cdfaa6ca07bec3d9a0809730cab7
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 3 15:28:52 2019 +0200
Remove useless method call
---
.../main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
index 1b86797..c3b6c3c 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java
@@ -59,7 +59,6 @@ public class PropertiesBasedPrefixResolver extends PrefixResolverDefault {
} else {
inputStream = new BufferedInputStream(new FileInputStream(pathToNamespaceConfigFile));
properties.load(inputStream);
- properties.entrySet();
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
NAMESPACE_MAP.put((String) entry.getKey(), (String) entry.getValue());
}
[jmeter] 02/04: Check for result of mkdir
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit d3ab7c671ccb8f24a6cc33a21c2930c19dda4ecc
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 3 16:01:46 2019 +0200
Check for result of mkdir
---
.../src/main/java/org/apache/jorphan/util/JOrphanUtils.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
index 18d7190..e700bed 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/util/JOrphanUtils.java
@@ -665,10 +665,12 @@ public final class JOrphanUtils {
if(deleteFolderIfExists) {
try {
FileUtils.deleteDirectory(folder);
- folder.mkdir();
} catch(IOException ex) {
- throw new IllegalArgumentException("Cannot write to '"
- +folder.getAbsolutePath()+"' as folder is not empty and cleanup failed with error:"+ex.getMessage(), ex);
+ throw new IllegalArgumentException("Cannot write to '" + folder.getAbsolutePath()
+ + "' as folder is not empty and cleanup failed with error:" + ex.getMessage(), ex);
+ }
+ if (!folder.mkdir()) {
+ throw new IllegalArgumentException("Cannot create folder " + folder.getAbsolutePath());
}
} else {
throw new IllegalArgumentException("Cannot write to '"
[jmeter] 04/04: spelchack
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit add3cc23232453df3cebf6af696424fcc9b66d83
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 3 16:02:46 2019 +0200
spelchack
---
src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
index 61d9d05..3e48849 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -628,7 +628,7 @@ public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable
}
/**
- * Create a clone of this HashTree. This is not a deep clone (ie, the
+ * Create a clone of this HashTree. This is not a deep clone (i.e., the
* contents of the tree are not cloned).
*
*/