cziegeler 2004/04/28 04:53:09
Modified: src/blocks/portal/java/org/apache/cocoon/portal/layout/impl
DefaultLayoutFactory.java
Log:
Fixing NPE when full screen coplet is removed
Revision Changes Path
1.17 +7 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
Index: DefaultLayoutFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultLayoutFactory.java 25 Apr 2004 20:09:34 -0000 1.16
+++ DefaultLayoutFactory.java 28 Apr 2004 11:53:09 -0000 1.17
@@ -54,6 +54,7 @@
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.LayoutFactory;
import org.apache.cocoon.portal.layout.renderer.Renderer;
+import org.apache.cocoon.portal.profile.ProfileManager;
import org.apache.cocoon.util.ClassUtils;
/**
@@ -416,7 +417,11 @@
CopletFactory factory =
service.getComponentManager().getCopletFactory();
factory.remove(
((CopletLayout)layout).getCopletInstanceData());
}
-
service.getComponentManager().getProfileManager().unregister(layout);
+ ProfileManager profileManager =
service.getComponentManager().getProfileManager();
+ if ( layout.equals(profileManager.getEntryLayout()) ) {
+ profileManager.setEntryLayout(null);
+ }
+ profileManager.unregister(layout);
} catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup portal
service.", ce);
} finally {
