Author: mgrigorov
Date: Fri Feb 25 17:47:57 2011
New Revision: 1074649
URL: http://svn.apache.org/viewvc?rev=1074649&view=rev
Log:
WICKET-3481 org/apache/wicket/velocity/VelocityContributor detach method
IModel is IDetachable.
Add a check for null to prevent NullPointerException
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=1074649&r1=1074648&r2=1074649&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
Fri Feb 25 17:47:57 2011
@@ -25,8 +25,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
/**
@@ -57,6 +57,8 @@ public class VelocityContributor extends
*/
public VelocityContributor(final String templateName, final IModel<?
extends Map<?, ?>> model)
{
+ Args.notNull(model, "model");
+
this.templateName = templateName;
this.model = model;
}
@@ -67,10 +69,7 @@ public class VelocityContributor extends
@Override
public void detach(final Component c)
{
- if (model instanceof IDetachable)
- {
- model.detach();
- }
+ model.detach();
}
/**
