Author: knopp
Date: Tue Apr 1 08:22:18 2008
New Revision: 643440
URL: http://svn.apache.org/viewvc?rev=643440&view=rev
Log:
WICKET-1467
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=643440&r1=643439&r2=643440&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
Tue Apr 1 08:22:18 2008
@@ -226,12 +226,15 @@
public Object getObject()
{
- // TODO: Remove this as soon as we can break binary
compatibility
- Component old = StringResourceModel.this.component;
- StringResourceModel.this.component = this.component;
- Object res = StringResourceModel.this.getObject();
- StringResourceModel.this.component = old;
- return res;
+ if (StringResourceModel.this.component != null) {
+ return StringResourceModel.this.getObject();
+ } else {
+ // TODO: Remove this as soon as we can break
binary compatibility
+ StringResourceModel.this.component =
this.component;
+ Object res =
StringResourceModel.this.getObject();
+ StringResourceModel.this.component = null;
+ return res;
+ }
}
public void setObject(Object object)
