 <cfset hasAction=structKeyExists(plugin.component,url.pluginAction)>
 
 <cfif hasAction>
-	<cfset rtnAction= plugin.component._action(url.pluginAction,lang,app,req)>
-    
+	<cfset rtnAction= plugin.component._action(url.pluginAction,lang,app,req)>    
 	<!--- cfset rtnAction= plugin.component[url.pluginAction](lang,app,req)--->
 </cfif>
 <cfif not isDefined('rtnAction')>

</cfif>

<!--- then call display --->
<cfset dspFile="/lucee_plugin_directory/#url.plugin#/#rtnAction#.cfm">

<cfset hasDisplay=fileExists(expandPath(dspFile))>
<cfif rtnAction NEQ "_none" and hasDisplay>
	<cftry>
		<cfset rtnAction= plugin.component._display(dspFile,lang,app,req)>

	<cfset application.plugin[url.plugin].application=struct()>
</cfif>
<cfif not structKeyExists(application.plugin[url.plugin],'component') or session.alwaysNew>
	<cftry>
		<cfset application.plugin[url.plugin].component=createObject('component','lucee_plugin_directory.'&url.plugin&'.Action')>
		<cfset application.plugin[url.plugin].mapping = "/lucee_plugin_directory">
		<cfcatch>
			<cfif request.adminType eq "web">
				<cfset application.plugin[url.plugin].component=createObject('component','lucee_server_plugin_directory.'&url.plugin&'.Action')>
				<cfset application.plugin[url.plugin].mapping = "/lucee_server_plugin_directory">
			</cfif>
		</cfcatch>
	</cftry>
	<cfset application.plugin[url.plugin].component.init(
			application.pluginLanguage[session.lucee_admin_lang][url.plugin],
			application.plugin[url.plugin].application)>		
</cfif>
<cfset plugin=application.plugin[url.plugin]>

