[seam-commits] Seam SVN: r7531 - in branches/Seam_2_0: src/debug/org/jboss/seam/debug and 1 other directories.
Author: pete.muir(a)jboss.org
Date: 2008-03-11 11:26:21 -0400 (Tue, 11 Mar 2008)
New Revision: 7531
Modified:
branches/Seam_2_0/doc/reference/en/modules/events.xml
branches/Seam_2_0/src/debug/org/jboss/seam/debug/Contexts.java
branches/Seam_2_0/src/main/org/jboss/seam/exception/Exceptions.java
Log:
Backport r7528, JBSEAM-2660
Modified: branches/Seam_2_0/doc/reference/en/modules/events.xml
===================================================================
--- branches/Seam_2_0/doc/reference/en/modules/events.xml 2008-03-11 15:25:32 UTC (rev
7530)
+++ branches/Seam_2_0/doc/reference/en/modules/events.xml 2008-03-11 15:26:21 UTC (rev
7531)
@@ -983,7 +983,7 @@
<para>
<literal>org.jboss.seam.handledException</literal> holds the
nested exception that
was actually handled by an exception handler. The outermost (wrapper)
exception is
- also available, as <literal>org.jboss.seam.exception</literal>.
+ also available, as
<literal>org.jboss.seam.caughtException</literal>.
</para>
</sect2>
Modified: branches/Seam_2_0/src/debug/org/jboss/seam/debug/Contexts.java
===================================================================
--- branches/Seam_2_0/src/debug/org/jboss/seam/debug/Contexts.java 2008-03-11 15:25:32 UTC
(rev 7530)
+++ branches/Seam_2_0/src/debug/org/jboss/seam/debug/Contexts.java 2008-03-11 15:26:21 UTC
(rev 7531)
@@ -61,7 +61,7 @@
public Exception getException()
{
- return (Exception)
org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.exception");
+ return (Exception)
org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
}
public List<Exception> getExceptionCauses()
Modified: branches/Seam_2_0/src/main/org/jboss/seam/exception/Exceptions.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/exception/Exceptions.java 2008-03-11
15:25:32 UTC (rev 7530)
+++ branches/Seam_2_0/src/main/org/jboss/seam/exception/Exceptions.java 2008-03-11
15:26:21 UTC (rev 7531)
@@ -50,7 +50,7 @@
{
if ( Contexts.isConversationContextActive() )
{
- Contexts.getConversationContext().set("org.jboss.seam.exception", e);
+
Contexts.getConversationContext().set("org.jboss.seam.caughtException", e);
}
//build a list of the nested exceptions