Author: bpapez
Date: Wed Nov 21 15:28:47 2007
New Revision: 19246
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19246&repname=
=3Djahia
Log:
Do not display stacktrace, when ServerOverloaded exception occurs
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/Jahia.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/Jahia.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/bin/Jahia.java&rev=3D19246&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/Jahia.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/Jahia.java Wed Nov 21 =
15:28:47 2007
@@ -51,6 +51,7 @@
import org.jahia.exceptions.JahiaOperationNotAllowedException;
import org.jahia.exceptions.JahiaPageNotFoundException;
import org.jahia.exceptions.JahiaSecurityException;
+import org.jahia.exceptions.JahiaServerOverloadedException;
import org.jahia.exceptions.JahiaSessionExpirationException;
import org.jahia.exceptions.JahiaSiteNotFoundException;
import org.jahia.exceptions.JahiaSiteAndPageIDMismatchException;
@@ -890,6 +891,13 @@
getServletContext(), jSettings, false, false, ex);
org.jahia.services.database.ConnectionDispenser.
abortConnection();
+ } catch (JahiaServerOverloadedException ex) {
+ // SERVER OVERLOADED
+ //logger.error(ex.getJahiaErrorMsg(), ex);
+ JahiaErrorDisplay.DisplayException(request, response,
+ getServletContext(), jSettings, true, false, ex);
+ org.jahia.services.database.ConnectionDispenser.
+ abortConnection(); =
} catch (JahiaSecurityException ex) {
// SECURITY EXCEPTION
logger.error("A Security error occured -> request ignored.=
",
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministrat=
ion.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D19246&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/bin/JahiaAdministration.ja=
va Wed Nov 21 15:28:47 2007
@@ -81,6 +81,7 @@
import org.jahia.exceptions.JahiaOperationNotAllowedException;
import org.jahia.exceptions.JahiaPageNotFoundException;
import org.jahia.exceptions.JahiaSecurityException;
+import org.jahia.exceptions.JahiaServerOverloadedException;
import org.jahia.exceptions.JahiaSessionExpirationException;
import org.jahia.exceptions.services.ServiceNotFoundException;
import org.jahia.params.AdminParamBean;
@@ -1027,7 +1028,14 @@
} catch (JahiaPageNotFoundException ex) {
logger.debug(ex.getJahiaErrorMsg(), ex);
JahiaErrorDisplay.DisplayException(request, response, getServl=
etContext(), jSettings, ex);
- }
+ } catch (JahiaServerOverloadedException ex) {
+ // SERVER OVERLOADED
+ //logger.error(ex.getJahiaErrorMsg(), ex);
+ JahiaErrorDisplay.DisplayException(request, response,
+ getServletContext(), jSettings, true, false, ex);
+ org.jahia.services.database.ConnectionDispenser.
+ abortConnection(); =
+ } =
// SECURITY EXCEPTION
catch (JahiaSecurityException ex) {
logger.debug("A Security error occured -> request ignored.", e=
x);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
