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

[hl...@apache.org]

Author: hlship
Date: Wed Apr 13 22:22:51 2011
New Revision: 1091939

URL: http://svn.apache.org/viewvc?rev=1091939&view=rev
Log:
TAP5-853: Fix generation of the set() method for public fields

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=1091939&r1=1091938&r2=1091939&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:22:51 2011
@@ -953,7 +953,7 @@ public class PropertyConduitSourceImpl i
 
                     String typeName = PlasticUtils.toTypeName(GenericsUtils.asClass(info.getType()));
 
-                    builder.loadArgument(0).unboxPrimitive(typeName);
+                    builder.loadArgument(1).castOrUnbox(typeName);
 
                     if (info.isField())
                     {
@@ -961,8 +961,11 @@ public class PropertyConduitSourceImpl i
                     }
                     else
                     {
+                        // TODO: Its not a no-args method. It's one arg.
                         invokeNoArgsMethod(builder, method);
                     }
+
+                    builder.returnResult();
                 }
             });
         }