You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2008/11/16 03:23:43 UTC
svn commit: r717962 -
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
Author: taylor
Date: Sat Nov 15 18:23:42 2008
New Revision: 717962
URL: http://svn.apache.org/viewvc?rev=717962&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-871
ojb anomaly. default preferences are now loading
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java?rev=717962&r1=717961&r2=717962&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java Sat Nov 15 18:23:42 2008
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.components.portletpreferences;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -501,7 +500,7 @@
String defaultsCacheKey = getPorletPreferenceKey(appName, portletName);
JetspeedPreferencesMap defaultsMap;
// first search in cache
- CacheElement cachedDefaults = preferenceCache.get(defaultsCacheKey);
+ CacheElement cachedDefaults = preferenceCache.get(defaultsCacheKey);
if (cachedDefaults != null)
{
defaultsMap = (JetspeedPreferencesMap)cachedDefaults.getContent();
@@ -515,9 +514,10 @@
c.addEqualTo("applicationName", appName);
c.addEqualTo("portletName", portletName);
QueryByCriteria query = QueryFactory.newQuery(DatabasePreference.class, c);
- Collection<DatabasePreference> preferences = getPersistenceBrokerTemplate().getCollectionByQuery(query);
- for (DatabasePreference preference : preferences)
+ Iterator<DatabasePreference> preferences = getPersistenceBrokerTemplate().getIteratorByQuery(query);
+ while (preferences.hasNext())
{
+ DatabasePreference preference = preferences.next();
JetspeedPreferenceImpl value = new JetspeedPreferenceImpl(preference.getName(), preference.getValues());
value.setReadOnly(preference.isReadOnly());
map.put(preference.getName(), value);
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org