Author: taylor
Date: Fri Feb 23 12:01:13 2007
New Revision: 511074
URL: http://svn.apache.org/viewvc?view=rev&rev=511074
Log:
bug fix: there are times when the fragment can be null
Modified:
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
Modified:
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java?view=diff&rev=511074&r1=511073&r2=511074
==============================================================================
---
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
(original)
+++
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
Fri Feb 23 12:01:13 2007
@@ -50,8 +50,8 @@
// construct merged portlet definition prefs map;
// note that user specific preferences accessed via
// the portlet entity should override these defaults
- int prefsSize = preferenceSet.size() + 1;
- if (fragment.getPreferences() != null)
+ int prefsSize = preferenceSet.size() + 1;
+ if (fragment != null && fragment.getPreferences() != null)
{
prefsSize += fragment.getPreferences().size();
}
@@ -67,7 +67,7 @@
// add/override global portlet definition defaults
// using more specific fragment preferences
- if (fragment.getPreferences() != null)
+ if (fragment != null && fragment.getPreferences() != null)
{
Iterator itr = fragment.getPreferences().iterator();
while(itr.hasNext())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
