Author: tdraier
Date: Fri Sep 14 13:04:56 2007
New Revision: 18467
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18467&repname=
=3Djahia
Log:
fixed exception handling (port 18266)
Modified:
trunk/core/src/java/org/jahia/operations/OperationManager.java
trunk/core/src/java/org/jahia/operations/valves/EngineValve.java
Modified: trunk/core/src/java/org/jahia/operations/OperationManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/operations/OperationManager.java&rev=3D18467&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
--- trunk/core/src/java/org/jahia/operations/OperationManager.java (origina=
l)
+++ trunk/core/src/java/org/jahia/operations/OperationManager.java Fri Sep =
14 13:04:56 2007
@@ -99,11 +99,14 @@
try {
processPipeline.invoke(jParams);
} catch (PipelineException pe) {
- logger.error("Error while processing request ", pe);
Throwable t =3D pe;
if (pe.getNested() !=3D null) {
t =3D pe.getNested();
}
+ if (t instanceof JahiaException) {
+ throw (JahiaException) t;
+ }
+ logger.error("Error while processing request ", pe);
throw new JahiaException("Error while processing request",
"Exception in processing pipeline",
JahiaException.ENGINE_ERROR,
Modified: trunk/core/src/java/org/jahia/operations/valves/EngineValve.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/operations/valves/EngineValve.java&rev=3D18467&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
--- trunk/core/src/java/org/jahia/operations/valves/EngineValve.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/operations/valves/EngineValve.java Fri Se=
p 14 13:04:56 2007
@@ -104,6 +104,8 @@
} catch (InterruptedException ie) {
logger.debug("The waiting thread has been interrupted :", ie);
throw new PipelineException(ie);
+ } catch (PipelineException pe) {
+ throw pe;
} catch (Throwable je) {
throw new PipelineException(je);
} finally {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
