Ticket #337: MGG-21_fix_EventContext.diff

home/jkrug/temp/modelglue/ModelGlue/gesture/eventrequest/EventContext.cfc

@@ -619 +619 @@
                                 <!--- so we don't have something we can attach keys to, lets make something--->
                                 <cfset ScopeContext[ thisEventKeyArray[j] ] = structNew() />
                         </cfif>
-                        <cfif j IS arrayLen( thisEventKeyArray ) AND i LTE arrayLen( arguments.ArrayOfDefaults )>
+                        <cfif j IS arrayLen( thisEventKeyArray ) AND variables._state.exists( EventKeyArray[i] )>
+                                <!--- if we are done dot-walking, and have an event value, lets use it. We should be done in the inner loop after this---->
+                                <cfset ScopeContext[ thisEventKeyArray[j] ] = variables._state.getValue( EventKeyArray[i] ) />
+                        <cfelseif j IS arrayLen( thisEventKeyArray ) AND i LTE arrayLen( arguments.ArrayOfDefaults )>
                                 <!--- if we are done dot-walking, and have a default, lets use it. We should be done in the inner loop after this---->
                                 <cfset ScopeContext[ thisEventKeyArray[j] ] = arguments.ArrayOfDefaults[i] />
                         <cfelseif j IS arrayLen( thisEventKeyArray )>
@@ -739 +742 @@
         <cfreturn variables._beanPopulator.populate(arguments.target, variables._state, fields) />
 </cffunction>
 
-</cfcomponent>
- No newline at end of file
+</cfcomponent>