taylor 2002/06/30 23:15:52
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeAction.java
src/java/org/apache/jetspeed/portal
JetspeedPortletInstance.java
Log:
Fixed a few null pointer checks in JetspeedPortletInstance
Revision Changes Path
1.10 +1 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java
Index: CustomizeAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CustomizeAction.java 1 Jul 2002 05:54:09 -0000 1.9
+++ CustomizeAction.java 1 Jul 2002 06:15:52 -0000 1.10
@@ -153,6 +153,7 @@
context.put("security_ref",
p.getPortletConfig().getSecurityRef().getParent());
if (p.getPortletConfig().getSkin() != null)
context.put("current_skin",
p.getPortletConfig().getPortletSkin().getName());
+
}
/** Clean up the customization state */
1.2 +9 -1
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java
Index: JetspeedPortletInstance.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedPortletInstance.java 1 Jul 2002 04:30:24 -0000 1.1
+++ JetspeedPortletInstance.java 1 Jul 2002 06:15:52 -0000 1.2
@@ -135,6 +135,10 @@
*/
public String getAttribute(String name, String dftValue)
{
+ if (entry == null)
+ {
+ return dftValue;
+ }
Parameter attr = entry.getParameter(name);
if (attr != null)
{
@@ -151,6 +155,10 @@
*/
public String getAttribute(String name)
{
+ if (entry == null)
+ {
+ return "";
+ }
Parameter attr = entry.getParameter(name);
if (attr != null)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
