java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java | 11
+++-----
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 10 ++++---
java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml | 13
++++------
3 files changed, 16 insertions(+), 18 deletions(-)
New commits:
commit f7981115f4397c95d758e980140e705eafc1cdf5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Apr 29 18:52:24 2009 -0400
497458 - fixing ISE with errata cloning
diff --git a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
index c591301..5ebb377 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/AbstractErrata.java
@@ -58,7 +58,7 @@ public abstract class AbstractErrata extends BaseDomainHelper
implements
private Boolean locallyModified;
private Date lastModified;
private Org org;
- private Set bugs;
+ private Set bugs = new HashSet();
private Set files;
private Set keywords;
protected Set packages;
@@ -372,7 +372,7 @@ public abstract class AbstractErrata extends BaseDomainHelper
implements
* {@inheritDoc}
*/
public void removeBug(Long bugId) {
- Iterator itr = bugs.iterator();
+ Iterator itr = getBugs().iterator();
Bug deleteme = null; // the bug to delete
while (itr.hasNext()) {
Bug bug = (Bug) itr.next();
@@ -381,7 +381,7 @@ public abstract class AbstractErrata extends BaseDomainHelper
implements
break;
}
}
- bugs.remove(deleteme);
+ getBugs().remove(deleteme);
ErrataFactory.removeBug(deleteme);
}
@@ -390,11 +390,8 @@ public abstract class AbstractErrata extends BaseDomainHelper
implements
* @param bugIn The bug to add
*/
public void addBug(Bug bugIn) {
- if (this.bugs == null) {
- this.bugs = new HashSet();
- }
// add bug to bugs
- bugs.add(bugIn);
+ this.getBugs().add(bugIn);
// set errata for bugIn
bugIn.setErrata(this);
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index 8db001a..7d71db7 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -329,12 +329,10 @@ public class ErrataFactory extends HibernateFactory {
* @return clone of e
*/
public static Errata createClone(Org org, Errata e) {
- UnpublishedClonedErrata clone = new UnpublishedClonedErrata();
- copyDetails(clone, e);
- String baseClonedAdvisoryName = "CL" +
clone.getAdvisoryName().substring(3);
- String baseClonedAdvisory = "CL" + clone.getAdvisory().substring(3);
+ String baseClonedAdvisoryName = "CL" +
e.getAdvisoryName().substring(3);
+ String baseClonedAdvisory = "CL" + e.getAdvisory().substring(3);
String clonedAdvisory = baseClonedAdvisory;
String clonedAdvisoryName = baseClonedAdvisoryName;
boolean unusedNameFound = false;
@@ -353,6 +351,10 @@ public class ErrataFactory extends HibernateFactory {
}
}
+ UnpublishedClonedErrata clone = new UnpublishedClonedErrata();
+
+ copyDetails(clone, e);
+
clone.setAdvisoryName(clonedAdvisoryName);
clone.setAdvisory(clonedAdvisory);
clone.setOriginal(e);
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
index dba4803..029cb6c 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/UnpublishedErrata.hbm.xml
@@ -38,26 +38,25 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
insert="false" update="false"/>
<many-to-one name="org"
class="com.redhat.rhn.domain.org.OrgImpl"
column="org_id"/>
- <set name="bugs" lazy="true" inverse="true"
order-by="BUG_ID asc"
- cascade="all-delete-orphan">
+ <set name="bugs" lazy="true" inverse="true"
+ cascade="all">
<key column="errata_id"/>
<one-to-many
class="com.redhat.rhn.domain.errata.impl.UnpublishedBug"/>
</set>
- <set name="files" lazy="true" inverse="true"
order-by="id asc"
+ <set name="files" lazy="true" inverse="true"
cascade="all-delete-orphan">
<key column="errata_id"/>
<one-to-many
class="com.redhat.rhn.domain.errata.impl.UnpublishedErrataFile"/>
</set>
- <set name="keywords" lazy="true" inverse="true"
order-by="KEYWORD asc"
- cascade="all-delete-orphan">
+ <set name="keywords" lazy="true" inverse="true"
+ cascade="all">
<key column="errata_id"/>
<one-to-many
class="com.redhat.rhn.domain.errata.impl.UnpublishedKeyword"/>
</set>
- <set name="packages" lazy="true"
table="rhnErrataPackageTmp"
- order-by="PACKAGE_ID asc">
+ <set name="packages" lazy="true"
table="rhnErrataPackageTmp" >
<key column="errata_id"/>
<many-to-many class="com.redhat.rhn.domain.rhnpackage.Package"
column="package_id"/>
Show replies by date