svn commit: r906797 - in /wicket/trunk/wicket/src/main: disabled/org/apache/wicket/util/tester/BaseWicketTester.java java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java

[ivaynberg]

Author: ivaynberg
Date: Fri Feb  5 03:29:03 2010
New Revision: 906797

URL: http://svn.apache.org/viewvc?rev=906797&view=rev
Log:
WICKET-2660
Issue: WICKET-2660

Modified:
    
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/util/tester/BaseWicketTester.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java

Modified: 
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/util/tester/BaseWicketTester.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/util/tester/BaseWicketTester.java?rev=906797&r1=906796&r2=906797&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/util/tester/BaseWicketTester.java
 (original)
+++ 
wicket/trunk/wicket/src/main/disabled/org/apache/wicket/util/tester/BaseWicketTester.java
 Fri Feb  5 03:29:03 2010
@@ -1086,7 +1086,9 @@
                                                log.debug("Triggering 
AjaxSelfUpdatingTimerBehavior: " +
                                                        
component.getClassRelativePath());
                                                AjaxSelfUpdatingTimerBehavior 
abstractAjaxBehaviour = (AjaxSelfUpdatingTimerBehavior)b;
+                                               if 
(!abstractAjaxBehavior.isStopped()) {
                                                
executeBehavior(abstractAjaxBehaviour);
+                                               }
                                        }
                                }
                                return CONTINUE_TRAVERSAL;

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=906797&r1=906796&r2=906797&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
 Fri Feb  5 03:29:03 2010
@@ -124,8 +124,7 @@
        @Override
        protected CharSequence getCallbackScript()
        {
-               return generateCallbackScript("wicketAjaxGet('" + 
getCallbackUrl() +
-                       "'");
+               return generateCallbackScript("wicketAjaxGet('" + 
getCallbackUrl() + "'");
        }
 
        /**
@@ -171,4 +170,14 @@
         *            The request target
         */
        protected abstract void onTimer(final AjaxRequestTarget target);
+
+       /**
+        * @return {...@code true} if has been stopped via {...@link #stop()}
+        */
+       public final boolean isStopped()
+       {
+               return stopped;
+       }
+
+
 }