fixes to handle screwy event properties

Author: Blair McKenzie

packages/events/cloudsearch.cfc

@@ -29,7 +29,8 @@
 
 		<!--- update index --->
 		<cfif not structIsEmpty(st)>
-			<cfset application.fapi.getContentType("csContentType").importIntoCloudSearch(stObject=arguments.stProperties, operation="updated") />
+			<cfset structappend(stProps, application.fapi.getContentType(typename=stProps.typename, objectid=stProps.objectid)) />
+			<cfset application.fapi.getContentType("csContentType").importIntoCloudSearch(stObject=stProps, operation="updated") />
 		</cfif>
 	</cffunction>
 

packages/types/csContentType.cfc

@@ -619,7 +619,11 @@
 				</cfswitch>
 
 				<cfcatch>
-				    <cfset exception = createObject("java", "java.lang.Exception").init("error setting #stFields[field].type# #field# to value #serializeJSON(arguments.stObject[property])# from #arguments.stObject.typename#:#arguments.stObject.objectid# - #cfcatch.message#") />
+					<cfset item = "" />
+					<cfif structKeyExists(arguments.stObject, property)>
+						<cfset item = arguments.stObject[property] />
+					</cfif>
+				    <cfset exception = createObject("java", "java.lang.Exception").init("error setting #stFields[field].type# #field# to value #serializeJSON(item)# from #arguments.stObject.typename#:#arguments.stObject.objectid# - #cfcatch.message#") />
 				    <cfset exception.initCause(cfcatch.getCause()) />
 				    <cfset exception.setStackTrace(cfcatch.getStackTrace()) />
 				    <cfthrow object="#exception#" />