Mercurial Hosting > luan
diff src/luan/modules/http/jetty/HttpServicer.java @ 1159:3ef883468fd0
remove Http.per_session_pages
fix clone closure bug
replace Thread.global with Thread.global_callable()
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Mon, 05 Feb 2018 12:37:59 -0700 |
parents | bbad9a21277c |
children |
line wrap: on
line diff
--- a/src/luan/modules/http/jetty/HttpServicer.java Mon Feb 05 10:04:07 2018 -0700 +++ b/src/luan/modules/http/jetty/HttpServicer.java Mon Feb 05 12:37:59 2018 -0700 @@ -18,7 +18,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import javax.servlet.http.Part; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,28 +45,14 @@ synchronized(luan) { PackageLuan.enableLoad(luan,"luan:http/Http.luan",modName); LuanTable module = (LuanTable)PackageLuan.require(luan,"luan:http/Http.luan"); - LuanTable per_session_pages = (LuanTable)module.rawGet("per_session_pages"); Object mod = PackageLuan.load(luan,modName); if( mod.equals(Boolean.FALSE) ) return false; if( !(mod instanceof LuanFunction) ) throw new LuanException( "module '"+modName+"' must return a function" ); - if( Boolean.TRUE.equals(per_session_pages.rawGet(mod)) ) { - HttpSession session = request.getSession(); - LuanState sessionLuan = (LuanState)session.getAttribute("luan"); - if( sessionLuan!=null ) { - luan = sessionLuan; - } else { - LuanCloner cloner = new LuanCloner(LuanCloner.Type.COMPLETE); - luan = (LuanState)cloner.clone(luan); - session.setAttribute("luan",luan); - } - fn = (LuanFunction)PackageLuan.require(luan,modName); - } else { - LuanCloner cloner = new LuanCloner(LuanCloner.Type.INCREMENTAL); - luan = (LuanState)cloner.clone(luan); - fn = (LuanFunction)cloner.get(mod); - } + LuanCloner cloner = new LuanCloner(LuanCloner.Type.INCREMENTAL); + luan = (LuanState)cloner.clone(luan); + fn = (LuanFunction)cloner.get(mod); } LuanTable module = (LuanTable)PackageLuan.require(luan,"luan:http/Http.luan");