Author: rwatler
Date: Tue Dec 29 06:50:14 2009
New Revision: 894314
URL: http://svn.apache.org/viewvc?rev=894314&view=rev
Log:
fix missing setProperty() scopeValue defaulting
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=894314&r1=894313&r2=894314&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
Tue Dec 29 06:50:14 2009
@@ -1382,6 +1382,11 @@
}
else if ((findFragmentPropertyScope != null) &&
findFragmentPropertyScope.equals(scope))
{
+ // default user scope value
+ if ((scopeValue == null) &&
scope.equals(USER_PROPERTY_SCOPE))
+ {
+ scopeValue = Utils.getCurrentUserScopeValue();
+ }
String findFragmentPropertyScopeValue =
findFragmentProperty.getScopeValue();
if ((findFragmentPropertyScopeValue != null) &&
findFragmentPropertyScopeValue.equals(scopeValue))
{
@@ -1399,6 +1404,11 @@
}
if (value != null)
{
+ // default user scope value
+ if ((scopeValue == null) && scope.equals(USER_PROPERTY_SCOPE))
+ {
+ scopeValue = Utils.getCurrentUserScopeValue();
+ }
getProperties().add(new ContentFragmentPropertyImpl(propName,
scope, scopeValue, value));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
