From 7ffe5725b354fcb2af5eb239e2c7ab62adba41d6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Mon, 15 Nov 2004 14:51:22 +0000 Subject: [PATCH] fix self-comparision git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277034 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/extension/Specification.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java index aa8be5ff3..6916766ed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java @@ -343,29 +343,31 @@ public final class Specification { } // Available specification version must be >= required - final DeweyDecimal specificationVersion + final DeweyDecimal otherSpecificationVersion = other.getSpecificationVersion(); if (null != specificationVersion) { - if (null == specificationVersion - || !isCompatible(specificationVersion, specificationVersion)) { + if (null == otherSpecificationVersion + || !isCompatible(specificationVersion, otherSpecificationVersion)) { return REQUIRE_SPECIFICATION_UPGRADE; } } // Implementation Vendor ID must match - final String implementationVendor = other.getImplementationVendor(); + final String otherImplementationVendor + = other.getImplementationVendor(); if (null != implementationVendor) { - if (null == implementationVendor - || !implementationVendor.equals(implementationVendor)) { + if (null == otherImplementationVendor + || !implementationVendor.equals(otherImplementationVendor)) { return REQUIRE_VENDOR_SWITCH; } } // Implementation version must be >= required - final String implementationVersion = other.getImplementationVersion(); + final String otherImplementationVersion + = other.getImplementationVersion(); if (null != implementationVersion) { - if (null == implementationVersion - || !implementationVersion.equals(implementationVersion)) { + if (null == otherImplementationVersion + || !implementationVersion.equals(otherImplementationVersion)) { return REQUIRE_IMPLEMENTATION_CHANGE; } }