raphael 01/06/04 11:57:43
Modified: src/java/org/apache/jetspeed/services/portaltoolkit
JetspeedPortalToolkitService.java
Log:
[fix] incorrect inheritance of skin because service did not send back a
null when expected
Revision Changes Path
1.2 +7 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java
Index: JetspeedPortalToolkitService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedPortalToolkitService.java 2001/06/04 17:30:35 1.1
+++ JetspeedPortalToolkitService.java 2001/06/04 18:57:43 1.2
@@ -81,7 +81,7 @@
* Simple implementation of the PortalFactoryService.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
- * @version $Id: JetspeedPortalToolkitService.java,v 1.1 2001/06/04 17:30:35
raphael Exp $
+ * @version $Id: JetspeedPortalToolkitService.java,v 1.2 2001/06/04 18:57:43
raphael Exp $
*/
public class JetspeedPortalToolkitService extends TurbineBaseService
implements PortalToolkitService
@@ -332,18 +332,15 @@
if (skin != null)
{
name = skin.getName();
- }
- else
- {
- name = defaultSkin;
- }
- // create the PortletSkin corresponding to this entry
- result = getSkin( name );
+ // create the PortletSkin corresponding to this entry
+ result = getSkin( name );
- // override the values with the locally defined properties
- result.putAll(getParameters(skin));
+ // override the values with the locally defined properties
+ result.putAll(getParameters(skin));
+ }
+
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
