svn commit: r1091942 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java

[hlship]

Author: hlship
Date: Wed Apr 13 22:23:00 2011
New Revision: 1091942

URL: http://svn.apache.org/viewvc?rev=1091942&view=rev
Log:
TAP5-853: When returning early from the navigate() method, load a fresh null 
and return that, to satisfy the verifier

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java?rev=1091942&r1=1091941&r2=1091942&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
 Wed Apr 13 22:23:00 2011
@@ -1345,10 +1345,10 @@ public class PropertyConduitSourceImpl i
                                     
builder.invokeStatic(PropertyConduitSourceImpl.class, void.class, "nullTerm",
                                             String.class, String.class, 
Object.class);
 
-                                    // Verifier doesn't realize that the 
static method throws and exception.
+                                    // Verifier doesn't realize that the 
static method throws an exception.
                                     // Add code, that never executes, to 
return the null on top of the stack
 
-                                    builder.returnResult();
+                                    builder.returnDefaultValue();
                             }
                         }
                     }, null);