modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java | 2 +- modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java | 2 +- modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java | 4 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 41348de6f90b9a7335a0e48e13752745eb64937e Merge: 9b0cd1f... 968f756... Author: Filip Drabek fdrabek@dhcp-lab-136.englab.brq.redhat.com Date: Thu Jul 1 12:00:16 2010 +0200
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
commit 9b0cd1f7ca26880dd57176153c78c7ffbcaeea6e Author: Filip Drabek fdrabek@dhcp-lab-136.englab.brq.redhat.com Date: Thu Jul 1 11:59:11 2010 +0200
fix of bugs in equals methods
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java index ab4f537..2b36da6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java @@ -146,7 +146,7 @@ public class AdvisoryBuglist implements Serializable { final AdvisoryBuglist other = (AdvisoryBuglist) obj;
if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java index 346880c..24d0c9b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java @@ -148,7 +148,7 @@ public class AdvisoryCVE implements Serializable { final AdvisoryCVE other = (AdvisoryCVE) obj;
if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { @@ -156,7 +156,7 @@ public class AdvisoryCVE implements Serializable { }
if (cve == null) { - if (cve != null) { + if (other.cve != null) { return false; } } else if (!cve.equals(other.cve)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java index 2185c65..a44136b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java @@ -148,7 +148,7 @@ public class AdvisoryPackage implements Serializable { final AdvisoryPackage other = (AdvisoryPackage) obj;
if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { @@ -156,7 +156,7 @@ public class AdvisoryPackage implements Serializable { }
if (pkg == null) { - if (pkg != null) { + if (other.pkg != null) { return false; } } else if (!pkg.equals(other.pkg)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java index 0ba61b0..1bf02b8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java @@ -173,7 +173,7 @@ public class DistributionFile { DistributionFile other = (DistributionFile) obj;
if (getDistribution() == null) { - if (getDistribution() != null) { + if (other.getDistribution() != null) { return false; } } else if (!getDistribution().equals(other.getDistribution())) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java index ffaaed7..316150b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java @@ -196,7 +196,7 @@ public class PackageVersionContentSource implements Serializable { final PackageVersionContentSource other = (PackageVersionContentSource) obj;
if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { @@ -204,7 +204,7 @@ public class PackageVersionContentSource implements Serializable { }
if (contentSource == null) { - if (contentSource != null) { + if (other.contentSource != null) { return false; } } else if (!contentSource.equals(other.contentSource)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java index 982c961..a8571bd 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java @@ -108,7 +108,7 @@ public class ProductVersionPackageVersion implements Serializable { final ProductVersionPackageVersion other = (ProductVersionPackageVersion) obj;
if (productVersion == null) { - if (productVersion != null) { + if (other.productVersion != null) { return false; } } else if (!productVersion.equals(other.productVersion)) { @@ -116,7 +116,7 @@ public class ProductVersionPackageVersion implements Serializable { }
if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java index dac537a..9f31e1c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java @@ -147,7 +147,7 @@ public class RepoAdvisory implements Serializable { final RepoAdvisory other = (RepoAdvisory) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -155,7 +155,7 @@ public class RepoAdvisory implements Serializable { }
if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java index 4311cc9..3c87044 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java @@ -130,7 +130,7 @@ public class RepoContentSource implements Serializable { final RepoContentSource other = (RepoContentSource) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -138,7 +138,7 @@ public class RepoContentSource implements Serializable { }
if (contentSource == null) { - if (contentSource != null) { + if (other.contentSource != null) { return false; } } else if (!contentSource.equals(other.contentSource)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java index 113c543..d9b8c8b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java @@ -142,7 +142,7 @@ public class RepoDistribution implements Serializable { final RepoDistribution other = (RepoDistribution) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -150,7 +150,7 @@ public class RepoDistribution implements Serializable { }
if (dist == null) { - if (dist != null) { + if (other.dist != null) { return false; } } else if (!dist.equals(other.dist)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java index 668fa32..90754ac 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java @@ -138,7 +138,7 @@ public class RepoPackageVersion implements Serializable { final RepoPackageVersion other = (RepoPackageVersion) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -146,7 +146,7 @@ public class RepoPackageVersion implements Serializable { }
if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java index 9a06210..527c83a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java @@ -127,7 +127,7 @@ public class RepoRepoGroup implements Serializable { final RepoRepoGroup other = (RepoRepoGroup) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -135,7 +135,7 @@ public class RepoRepoGroup implements Serializable { }
if (repoGroup == null) { - if (repoGroup != null) { + if (other.repoGroup != null) { return false; } } else if (!repoGroup.equals(other.repoGroup)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java index c93f374..3375c69 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java @@ -134,7 +134,7 @@ public class RepoRepoRelationship implements Serializable { final RepoRepoRelationship other = (RepoRepoRelationship) obj;
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -142,7 +142,7 @@ public class RepoRepoRelationship implements Serializable { }
if (repoRelationship == null) { - if (repoRelationship != null) { + if (other.repoRelationship != null) { return false; } } else if (!repoRelationship.equals(other.repoRelationship)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java index 54721eb..2944bef 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java @@ -137,7 +137,7 @@ public class ResourceRepo implements Serializable { final ResourceRepo other = (ResourceRepo) obj;
if (resource == null) { - if (resource != null) { + if (other.resource != null) { return false; } } else if (!resource.equals(other.resource)) { @@ -145,7 +145,7 @@ public class ResourceRepo implements Serializable { }
if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) {