svn commit: r1069223 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/request/cycle/RequestCycle.java test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java

[ivaynberg]

Author: ivaynberg
Date: Thu Feb 10 03:53:35 2011
New Revision: 1069223

URL: http://svn.apache.org/viewvc?rev=1069223&view=rev
Log:

Issue: WICKET-3428

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=1069223&r1=1069222&r2=1069223&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
 Thu Feb 10 03:53:35 2011
@@ -199,6 +199,8 @@ public class RequestCycle extends Reques
                try
                {
                        set(this);
+                       listeners.onBeginRequest(this);
+                       onBeginRequest();
                        IRequestHandler handler = resolveRequestHandler();
                        if (handler != null)
                        {
@@ -242,8 +244,6 @@ public class RequestCycle extends Reques
                boolean result;
                try
                {
-                       listeners.onBeginRequest(this);
-                       onBeginRequest();
                        result = processRequest();
                }
                finally

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java?rev=1069223&r1=1069222&r2=1069223&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
 Thu Feb 10 03:53:35 2011
@@ -273,6 +273,7 @@ public class RequestCycleListenerTest ex
 
                public void onBeginRequest(final RequestCycle cycle)
                {
+                       assertNotNull(RequestCycle.get());
                        begins++;
                }