You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/07/10 05:57:21 UTC
ant-ivy git commit: Fix some string comparisons with ==
Repository: ant-ivy
Updated Branches:
refs/heads/master 0ce17f931 -> d0f7f364f
Fix some string comparisons with ==
Also fix ModuleDescriptorMemoryCacheTest to have it use a settings variable, while resolving a module descriptor in cache, before changing that variable
This closes #51 PR at github/apache/ant-ivy
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/d0f7f364
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/d0f7f364
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/d0f7f364
Branch: refs/heads/master
Commit: d0f7f364ff959a69ab961eda69956bd42bc17815
Parents: 0ce17f9
Author: Trung Do <ch...@gmail.com>
Authored: Thu Jul 6 19:31:36 2017 -0400
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Mon Jul 10 11:07:02 2017 +0530
----------------------------------------------------------------------
src/java/org/apache/ivy/ant/IvyBuildList.java | 2 +-
src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java | 2 +-
src/java/org/apache/ivy/core/module/id/MatcherLookup.java | 2 +-
src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java | 2 +-
src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java | 2 +-
.../org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java | 1 +
6 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/src/java/org/apache/ivy/ant/IvyBuildList.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyBuildList.java b/src/java/org/apache/ivy/ant/IvyBuildList.java
index b0cbf98..84cc0c6 100644
--- a/src/java/org/apache/ivy/ant/IvyBuildList.java
+++ b/src/java/org/apache/ivy/ant/IvyBuildList.java
@@ -516,7 +516,7 @@ public class IvyBuildList extends IvyTask {
*/
@Deprecated
public boolean isSkipbuildwithoutivy() {
- return onMissingDescriptor == OnMissingDescriptor.SKIP;
+ return OnMissingDescriptor.SKIP.equals(onMissingDescriptor);
}
/**
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java b/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java
index 8061ec8..c0a971d 100644
--- a/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java
+++ b/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java
@@ -145,7 +145,7 @@ class ParserSettingsMonitor {
public String substitute(String value) {
String r = delegatedSettings.substitute(value);
- if (value != null && value != r) {
+ if (value != null && !value.equals(r)) {
substitutes.put(value, r);
}
return r;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/src/java/org/apache/ivy/core/module/id/MatcherLookup.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/module/id/MatcherLookup.java b/src/java/org/apache/ivy/core/module/id/MatcherLookup.java
index 714643a..56c0ca7 100644
--- a/src/java/org/apache/ivy/core/module/id/MatcherLookup.java
+++ b/src/java/org/apache/ivy/core/module/id/MatcherLookup.java
@@ -112,7 +112,7 @@ public class MatcherLookup {
}
}
// Step 3: (iff key != DEFAULT) find matchers from exact_matchers of DEFAULT
- if (key != DEFAULT) {
+ if (!DEFAULT.equals(key)) {
List<MapMatcher> default_exact_matchers = lookup.get(DEFAULT);
if (default_exact_matchers != null) {
for (MapMatcher matcher : default_exact_matchers) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java b/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
index 8a9b9d1..03c2441 100644
--- a/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
+++ b/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java
@@ -127,7 +127,7 @@ public class ArtifactDownloadReport {
if (downloadStatus == DownloadStatus.SUCCESSFUL) {
return "[SUCCESSFUL ] " + artifact + " (" + downloadTimeMillis + "ms)";
} else if (downloadStatus == DownloadStatus.FAILED) {
- if (downloadDetails == MISSING_ARTIFACT) {
+ if (MISSING_ARTIFACT.equals(downloadDetails)) {
return "[NOT FOUND ] " + artifact + " (" + downloadTimeMillis + "ms)";
} else {
return "[FAILED ] " + artifact + ": " + downloadDetails + " ("
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
index 7ba23f2..eedb4aa 100644
--- a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
@@ -473,7 +473,7 @@ public class P2MetadataParser implements XMLInputParser {
return;
}
BundleCapability capability;
- if (type == BundleInfo.PACKAGE_TYPE) {
+ if (BundleInfo.PACKAGE_TYPE.equals(type)) {
capability = new ExportPackage(child.name, child.version);
} else {
capability = new BundleCapability(type, child.name, child.version);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/d0f7f364/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
index 36647a0..9052307 100644
--- a/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
+++ b/test/java/org/apache/ivy/core/cache/ModuleDescriptorMemoryCacheTest.java
@@ -123,6 +123,7 @@ public class ModuleDescriptorMemoryCacheTest {
public void testVariableChangeInvalidateEntry() throws ParseException, IOException {
ModuleDescriptorProviderMock providerMock = new ModuleDescriptorProviderMock(md1);
ModuleDescriptorProviderMock providerMock2 = new ModuleDescriptorProviderMock(md1);
+ ivySettings2.getVariables().setVariable("val", "firstVal", true);
assertEquals(md1, cache.get(url1, ivySettings2, false, providerMock));
ivySettings2.getVariables().setVariable("val", "changedVal", true);
assertEquals(md1, cache.get(url1, ivySettings2, false, providerMock2));