modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java |
2 +-
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java |
2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 07ae93f34338458daa75082ef519b4b1851ddc0c
Merge: 5e17b2f... 2d97557...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 25 11:08:38 2009 -0500
Merge branch 'master' into pc
commit 2d97557a1e09ab13248f5da0e81a8d530731ed78
Author: John Sanda <john(a)localhost.localdomain>
Date: Wed Nov 25 11:03:16 2009 -0500
Eagerly initializing underlying list and map in PropertyList and PropertyMap to avoid
NPEs
This change was already made in the raw-config branch a while back, and needed to be
ported over.
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
index 2bc77f9..c3e26a0 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java
@@ -68,7 +68,7 @@ public class PropertyList extends Property {
@Cascade( { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH,
CascadeType.DELETE_ORPHAN })
@OneToMany(mappedBy = "parentList", targetEntity = Property.class, fetch =
FetchType.EAGER)
//@IndexColumn(name = "list_index") TODO GH: This seems broken
- private List<Property> list;
+ private List<Property> list = new ArrayList<Property>();
@Transient
String memberPropertyName;
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
index 114720f..e8e15b7 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java
@@ -68,7 +68,7 @@ public class PropertyMap extends Property implements AbstractPropertyMap
{
@Cascade( { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH,
CascadeType.DELETE_ORPHAN })
@MapKey(name = "name")
@OneToMany(mappedBy = "parentMap", fetch = FetchType.EAGER)
- private Map<String, Property> map;
+ private Map<String, Property> map = new LinkedHashMap<String,
Property>();
/**
* Creates a new unnamed and empty {@link PropertyMap} object.
Show replies by date