Author: xlawrence
Date: Tue Jan 10 16:53:00 2006
New Revision: 12745
URL: https://jahia.mine.nu/websvn/listing.php?sc=1&rev=12745&repname=jahia
Log:
added check to avoid sending an error if response has already been committed
Modified:
trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java
Modified: trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java
URL:
https://jahia.mine.nu/websvn/diff.php?path=/trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java&rev=12745&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java
(original)
+++ trunk/core/src/java/org/jahia/ajax/actionmenus/GetMenuItemsAction.java Tue
Jan 10 16:53:00 2006
@@ -49,27 +49,25 @@
import org.jahia.gui.GuiBean;
import org.jahia.gui.HTMLToolBox;
import org.jahia.gui.menuIdPropsBean;
-import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ProcessingContext;
-import org.jahia.params.ProcessingContextFactory;
-import org.jahia.registries.ServicesRegistry;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.EntryLoadRequest;
-import org.springframework.beans.factory.BeanFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
/**
* Gets the items of a specific Action Menu
*
* @author Xavier Lawrence
- * @version $Id$
*/
public class GetMenuItemsAction extends AjaxAction {
@@ -96,13 +94,6 @@
private static final org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(GetMenuItemsAction.class);
- private static final ServicesRegistry servicesRegistry =
ServicesRegistry.getInstance();
-
- private static final BeanFactory bf =
SpringContextSingleton.getInstance().getContext();
-
- private static final ProcessingContextFactory pcf =
- (ProcessingContextFactory) bf.
getBean(ProcessingContextFactory.class.getName());
-
/**
* Returns the menu items for the specified Action Menu.
*
@@ -210,7 +201,7 @@
final String msg = "Unknown 'ObjectType' value ! 'ObjectType'
value should be '" +
PageBean.TYPE + "', '" + ContainerListBean.TYPE + "',
'" +
ContainerBean.TYPE + "' or '" + FieldBean.TYPE + "'.";
- logger.fatal(msg);
+ logger.error(msg);
response.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
return null;
}
@@ -254,9 +245,11 @@
sendResponse(xmlTagNames, xmlTagValues, response);
} catch (Exception e) {
- logger.fatal("Unable to process the request !", e);
- response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- "Unable to process the request ! Msg: " + e.getMessage());
+ logger.error("Unable to process the request !", e);
+ if (! response.isCommitted()) {
+
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "Unable to process the request ! Msg: " +
e.getMessage());
+ }
}
return null;
}
@@ -374,16 +367,4 @@
}
return result.toString();
}
-}
-
-/**
-* $Log$
-* Revision 1.7 2006/01/09 13:48:30 cmailleux
-* Commit Jetspeed 2
-* Enueuing of Pages
-* Show Edit menu when user have only rights to edit subelement of the page
but not all the page
-*
-* Revision 1.6 2005/11/30 16:11:12 dpillot
-* added readable debug
-*
-*/
\ No newline at end of file
+}
\ No newline at end of file
