svn commit: r737503 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sun Jan 25 11:42:02 2009
New Revision: 737503

URL: http://svn.apache.org/viewvc?rev=737503&view=rev
Log:
fixed wicket-2045: FileUploadField.onDetach() causes IllegalStateException()

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java?rev=737503&r1=737502&r2=737503&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/FileUploadField.java Sun Jan 25 11:42:02 2009
@@ -90,6 +90,18 @@
 	}
 
 	/**
+	 * @see org.apache.wicket.markup.html.form.FormComponent#updateModel()
+	 */
+	@Override
+	public void updateModel()
+	{
+		if (getModel() != null)
+		{
+			super.updateModel();
+		}
+	}
+
+	/**
 	 * @see org.apache.wicket.Component#setDefaultModel(org.apache.wicket.model.IModel)
 	 */
 	@Override
@@ -112,6 +124,10 @@
 		return null;
 	}
 
+	/**
+	 * 
+	 * @see org.apache.wicket.markup.html.form.FormComponent#convertValue(java.lang.String[])
+	 */
 	@Override
 	protected FileUpload convertValue(String[] value) throws ConversionException
 	{
@@ -168,11 +184,15 @@
 	@Override
 	protected void onDetach()
 	{
-		if (fileUpload != null && forceCloseStreamsOnDetach())
+		if ((fileUpload != null) && forceCloseStreamsOnDetach())
 		{
 			fileUpload.closeStreams();
 			fileUpload = null;
-			setModelObject(null);
+
+			if (getModel() != null)
+			{
+				setModelObject(null);
+			}
 		}
 		super.onDetach();
 	}