From 1700aa0b9e5bac1e1e6b70f17173dd109576585e Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 5 Nov 2004 15:02:05 +0000 Subject: [PATCH] Make getCompatibilityWith actually compare two different values. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 31360 Submitted by: David G�rtner git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277000 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/optional/extension/Extension.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java index 15a36146e..ab3bae675 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java @@ -444,31 +444,31 @@ public final class Extension { } // Available specification version must be >= required - final DeweyDecimal specificationVersion + final DeweyDecimal requiredSpecificationVersion = required.getSpecificationVersion(); - if (null != specificationVersion) { + if (null != requiredSpecificationVersion) { if (null == specificationVersion - || !isCompatible(specificationVersion, specificationVersion)) { + || !isCompatible(specificationVersion, requiredSpecificationVersion)) { return REQUIRE_SPECIFICATION_UPGRADE; } } // Implementation Vendor ID must match - final String implementationVendorId + final String requiredImplementationVendorID = required.getImplementationVendorID(); - if (null != implementationVendorId) { + if (null != requiredImplementationVendorID) { if (null == implementationVendorID - || !implementationVendorID.equals(implementationVendorId)) { + || !implementationVendorID.equals(requiredImplementationVendorID)) { return REQUIRE_VENDOR_SWITCH; } } // Implementation version must be >= required - final DeweyDecimal implementationVersion + final DeweyDecimal requiredImplementationVersion = required.getImplementationVersion(); - if (null != implementationVersion) { + if (null != requiredImplementationVersion) { if (null == implementationVersion - || !isCompatible(implementationVersion, implementationVersion)) { + || !isCompatible(implementationVersion, requiredImplementationVersion)) { return REQUIRE_IMPLEMENTATION_UPGRADE; } }