svn commit: [jahia] r14898 - /trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java

[xlawrence]

Author: xlawrence
Date: Tue Aug 15 14:01:35 2006
New Revision: 14898

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14898&repname=jahia
Log:
avoid NPE

Modified:
    trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java

Modified: 
trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java&rev=14898&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java 
(original)
+++ trunk/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java 
Tue Aug 15 14:01:35 2006
@@ -762,7 +762,16 @@
                                                    final ProcessingContext 
jParams) throws JahiaException {
         final JahiaContainersService jahiaContainersService = 
ServicesRegistry.getInstance().getJahiaContainersService();
         JahiaContainerList list = 
jahiaContainersService.loadContainerListInfo(theContainer.getListID());
-        final int containerParentID = ((Integer) 
engineMap.get("containerParentID")).intValue();
+        int containerParentID = 0;
+        try {
+            containerParentID = ((Integer) 
engineMap.get("containerParentID")).intValue();
+        } catch (Exception e) {
+            try {
+                containerParentID = 
Integer.parseInt(jParams.getParameter("cparentid"));
+            } catch (Exception ee) {
+                logger.warn("Unable to set EngineMap value 
'containerParentID'");
+            }
+        }
         final int id = 
jahiaContainersService.getContainerListID(theContainer.getDefinition().getName(),
 theContainer.getPageID(), containerParentID);
         if (list == null && id > 0) {
             list = jahiaContainersService.loadContainerListInfo(id);