You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by de...@apache.org on 2007/12/28 09:42:11 UTC
svn commit: r607190 -
/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
Author: dettborn
Date: Fri Dec 28 00:42:10 2007
New Revision: 607190
URL: http://svn.apache.org/viewvc?rev=607190&view=rev
Log:
fix NullpointerException for PortletPreferences
Modified:
portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java?rev=607190&r1=607189&r2=607190&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java Fri Dec 28 00:42:10 2007
@@ -122,19 +122,21 @@
PortletPreferencesDD prefsDD = portletDD.getPortletPreferences();
if (prefsDD != null) {
List prefs = new ArrayList();
- for (Iterator it = prefsDD.getPortletPreferences().iterator();
- it.hasNext(); ) {
- PortletPreferenceDD prefDD = (PortletPreferenceDD) it.next();
- String[] values = null;
- if (prefDD.getValues()!=null){
- if (prefDD.getValues().size() > 0) {
- values = (String[]) prefDD.getValues().toArray(
- new String[prefDD.getValues().size()]);
+ if (prefsDD.getPortletPreferences() != null){
+ for (Iterator it = prefsDD.getPortletPreferences().iterator();
+ it.hasNext(); ) {
+ PortletPreferenceDD prefDD = (PortletPreferenceDD) it.next();
+ String[] values = null;
+ if (prefDD.getValues()!=null){
+ if (prefDD.getValues().size() > 0) {
+ values = (String[]) prefDD.getValues().toArray(
+ new String[prefDD.getValues().size()]);
+ }
}
- }
- PortletPreferenceImpl pref = new PortletPreferenceImpl(
- prefDD.getName(), values, prefDD.isReadOnly());
- prefs.add(pref);
+ PortletPreferenceImpl pref = new PortletPreferenceImpl(
+ prefDD.getName(), values, prefDD.isReadOnly());
+ prefs.add(pref);
+ }
}
defaultPreferences = (InternalPortletPreference[])
prefs.toArray(new InternalPortletPreference[prefs.size()]);