Author: jcompagner
Date: Thu Aug  9 14:25:20 2007
New Revision: 564385

URL: http://svn.apache.org/viewvc?view=rev&rev=564385
Log:
test for if the model returns this as its object (something the wasp and swarm 
developer can think of)

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java?view=diff&rev=564385&r1=564384&r2=564385
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java
 Thu Aug  9 14:25:20 2007
@@ -183,7 +183,10 @@
                Object object = target;
                while (object instanceof IModel)
                {
-                       object = ((IModel)object).getObject();
+                       Object tmp = ((IModel)object).getObject();
+                       if (tmp == object)
+                               break;
+                       object = tmp;
                }
                return object;
        }


Reply via email to