cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity JetspeedPowerTool.java

[taylor]

taylor      2004/11/07 08:29:57

  Modified:    portal/src/java/org/apache/jetspeed/velocity
                        JetspeedPowerTool.java
  Log:
  NPE fix
  
  Revision  Changes    Path
  1.35      +2 -2      
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
  
  Index: JetspeedPowerTool.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- JetspeedPowerTool.java    29 Oct 2004 01:17:36 -0000      1.34
  +++ JetspeedPowerTool.java    7 Nov 2004 16:29:57 -0000       1.35
  @@ -1167,7 +1167,7 @@
           {
               title = 
Jetspeed.getCurrentRequestContext().getPreferedLanguage(entity.getPortletDefinition()).getTitle();
           }
  -        if (title == null)
  +        if (title == null && entity != null)
           {
               title = entity.getPortletDefinition().getName();
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]