Author: woonsan
Date: Mon Mar 8 21:55:09 2010
New Revision: 920533
URL: http://svn.apache.org/viewvc?rev=920533&view=rev
Log:
JS2-1057: Avoiding NPE. Unlike portlet registry, page from page manager could
have metadata with null localized fields.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java?rev=920533&r1=920532&r2=920533&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/services/beans/GenericMetadataBean.java
Mon Mar 8 21:55:09 2010
@@ -48,14 +48,19 @@
public GenericMetadataBean(final GenericMetadata metadata)
{
- List<LocalizedFieldBean> localizedFieldBeanList = new
ArrayList<LocalizedFieldBean>();
+ Collection<LocalizedField> fields = metadata.getFields();
- for (LocalizedField field : metadata.getFields())
+ if (fields != null)
{
- localizedFieldBeanList.add(new LocalizedFieldBean(field));
- }
+ List<LocalizedFieldBean> localizedFieldBeanList = new
ArrayList<LocalizedFieldBean>();
+
+ for (LocalizedField field : fields)
+ {
+ localizedFieldBeanList.add(new LocalizedFieldBean(field));
+ }
- localizedFieldBeans = localizedFieldBeanList;
+ localizedFieldBeans = localizedFieldBeanList;
+ }
}
@XmlElementWrapper(name="fields")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
