cziegeler 2004/03/18 11:01:15
Modified: src/blocks/portal/java/org/apache/cocoon/portal/pluto
PortletURLProviderImpl.java
Log:
Fix for NPE as reported in bug 27518
Revision Changes Path
1.5 +7 -1
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletURLProviderImpl.java 16 Mar 2004 15:56:43 -0000 1.4
+++ PortletURLProviderImpl.java 18 Mar 2004 19:01:15 -0000 1.5
@@ -194,6 +194,12 @@
PortalService service = null;
try {
service = (PortalService)
this.manager.lookup(PortalService.ROLE);
+ if ( service.getPortalName() == null ) {
+ // this happens when the core log is set to debug
+ // and Cocoon debugs all session attributes
+ // otherwise this can't happen
+ return super.toString();
+ }
LinkService linkService =
service.getComponentManager().getLinkService();
//TODO - secure