svn commit: r528417 - /incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java

[dashorst]

Author: dashorst
Date: Fri Apr 13 03:00:23 2007
New Revision: 528417

URL: http://svn.apache.org/viewvc?view=rev&rev=528417
Log:
Fixed NPE in AjaxFormCOmponentUpdatingBehavior

Modified:
    
incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java

Modified: 
incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?view=diff&rev=528417&r1=528416&r2=528417
==============================================================================
--- 
incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
 (original)
+++ 
incubator/wicket/tags/dashorst/20061204-1855/wicket/src/main/java/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
 Fri Apr 13 03:00:23 2007
@@ -85,13 +85,13 @@
        protected final CharSequence getEventHandler()
        {
                return getCallbackScript(new 
AppendingStringBuffer("wicketAjaxPost('").append(
-                               getCallbackUrl()).append(
+                               getCallbackUrl(true, false)).append(
                                "', wicketSerialize(document.getElementById('" 
+ getComponent().getMarkupId()
                                                + "'))"), null, null);
        }
 
        /**
-        * @see wicket.ajax.AjaxEventBehavior#onCheckEvent(java.lang.String)
+        * @see 
org.apache.wicket.ajax.AjaxEventBehavior#onCheckEvent(java.lang.String)
         */
        protected void onCheckEvent(String event)
        {
@@ -109,7 +109,6 @@
        protected final void onEvent(final AjaxRequestTarget target)
        {
                final FormComponent formComponent = getFormComponent();
-               boolean callOnUpdate = true;
 
                try
                {
@@ -125,20 +124,14 @@
                        {
                                formComponent.valid();
                                formComponent.updateModel();
+                               onUpdate(target);
                        }
                }
                catch (RuntimeException e)
                {
-                       callOnUpdate = false;
                        onError(target, e);
 
                }
-
-               if (callOnUpdate)
-               {
-                       onUpdate(target);
-               }
-
        }
 
        /**
@@ -153,14 +146,14 @@
         * Called to handle any error resulting from updating form component. 
Errors
         * thrown from [EMAIL PROTECTED] #onUpdate(AjaxRequestTarget)} will not 
be caught here.
         * 
-        * The exception param can be null then it is an validate failure, if 
the 
-        * Exception is not null then an exception did happen.
+        * The RuntimeException will be null if it was just a validation or 
conversion 
+        * error of the FormComponent
         * 
         * @param target
         * @param e
         */
        protected void onError(AjaxRequestTarget target, RuntimeException e)
        {
-               throw e;
+               if(e != null) throw e;
        }
 }