Repository: marmotta Updated Branches: refs/heads/develop 7f80dbdd7 -> 37867a109
KiWi: - fix loading order in KiWiConnection so result sets are not closed when loading the literal type Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/37867a10 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/37867a10 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/37867a10 Branch: refs/heads/develop Commit: 37867a109c677200787fdf4157c48d8a64533236 Parents: 749bc56 Author: Sebastian Schaffert <[email protected]> Authored: Mon Nov 10 18:32:39 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Nov 10 18:39:34 2014 +0100 ---------------------------------------------------------------------- .../apache/marmotta/kiwi/persistence/KiWiConnection.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/37867a10/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java index 0ddf28f..dba0c0e 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java @@ -1849,13 +1849,15 @@ public class KiWiConnection implements AutoCloseable { cacheNode(result); return result; } else if("date".equals(ntype)) { - KiWiDateLiteral result; + KiWiDateLiteral result = new KiWiDateLiteral(); + result.setCreated(new Date(row.getTimestamp(11, calendarUTC).getTime())); + + DateTime dvalue = new DateTime(row.getTimestamp(6, calendarUTC).getTime(), DateTimeZone.forOffsetMillis(row.getInt(7)*1000)); if(row.getLong(10) != 0) { - result = new KiWiDateLiteral(new DateTime(row.getTimestamp(6, calendarUTC).getTime(), DateTimeZone.forOffsetMillis(row.getInt(7)*1000)), (KiWiUriResource) loadNodeById(row.getLong(10)), new Date(row.getTimestamp(11, calendarUTC).getTime())); - } else { - result = new KiWiDateLiteral(new DateTime(row.getTimestamp(6, calendarUTC).getTime(), DateTimeZone.forOffsetMillis(row.getInt(7)*1000)), null, new Date(row.getTimestamp(11, calendarUTC).getTime())); + result.setType((KiWiUriResource) loadNodeById(row.getLong(10))); } result.setId(id); + result.setDateContent(dvalue); cacheNode(result); return result;
