diff --git a/README.html b/README.html index 554f92b1..0309b4e9 100644 --- a/README.html +++ b/README.html @@ -977,8 +977,9 @@ Files are no longer hosted at LuaForge.
  • Fix return value for table.remove() and table.insert() (fixes issue #39)
  • Fix aliasing issue for some multiple assignments from varargs return values (fixes issue #38)
  • Let os.getenv() return System.getenv() values first for JSE, then fall back to properties (fixes issue #25)
  • -
  • Improve collection of orphaned coroutines when yielding from debug hook functions.
  • -
  • LuaScriptEngineFactory.getScriptEngine() now returns new instance of lua script engine for each call.
  • +
  • Improve garbage collection of orphaned coroutines when yielding from debug hook functions (fixes issue #32).
  • +
  • LuaScriptEngineFactory.getScriptEngine() now returns new instance of LuaScriptEngine for each call.
  • +
  • Fix os.date("*t") to return hour in 24 hour format (fixes issue #45)
  • diff --git a/src/core/org/luaj/vm2/lib/OsLib.java b/src/core/org/luaj/vm2/lib/OsLib.java index 1a1ca40a..8e50b707 100644 --- a/src/core/org/luaj/vm2/lib/OsLib.java +++ b/src/core/org/luaj/vm2/lib/OsLib.java @@ -150,7 +150,7 @@ public class OsLib extends TwoArgFunction { tbl.set("year", LuaValue.valueOf(d.get(Calendar.YEAR))); tbl.set("month", LuaValue.valueOf(d.get(Calendar.MONTH)+1)); tbl.set("day", LuaValue.valueOf(d.get(Calendar.DAY_OF_MONTH))); - tbl.set("hour", LuaValue.valueOf(d.get(Calendar.HOUR))); + tbl.set("hour", LuaValue.valueOf(d.get(Calendar.HOUR_OF_DAY))); tbl.set("min", LuaValue.valueOf(d.get(Calendar.MINUTE))); tbl.set("sec", LuaValue.valueOf(d.get(Calendar.SECOND))); tbl.set("wday", LuaValue.valueOf(d.get(Calendar.DAY_OF_WEEK)));