Repository: jena Updated Branches: refs/heads/ThreadPerGraphDataset aa703b908 -> 79d1d3fdc (forced update)
Rename Log.fatal as Log.error (more usually naming). Leave deprecations in place. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/08747773 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/08747773 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/08747773 Branch: refs/heads/ThreadPerGraphDataset Commit: 087477733906d64bc30115040e6c24d8e8e56e22 Parents: 37a15f3 Author: Andy Seaborne <[email protected]> Authored: Wed Jan 25 20:29:48 2017 +0000 Committer: Andy Seaborne <[email protected]> Committed: Wed Jan 25 20:29:48 2017 +0000 ---------------------------------------------------------------------- .../org/apache/jena/query/ResultSetFactory.java | 8 +++--- .../org/apache/jena/query/SortCondition.java | 2 +- .../engine/iterator/QueryIterCommonParent.java | 2 +- .../engine/iterator/QueryIterRepeatApply.java | 2 +- .../engine/iterator/QueryIteratorBase.java | 4 +-- .../engine/main/StageGeneratorGeneric.java | 2 +- .../optimizer/reorder/ReorderProcIndexes.java | 2 +- .../jena/sparql/lang/ParserARQUpdate.java | 2 +- .../jena/sparql/lang/ParserSPARQL11Update.java | 2 +- .../org/apache/jena/sparql/lib/Metadata.java | 4 +-- .../jena/sparql/syntax/ElementService.java | 2 +- .../java/org/apache/jena/atlas/logging/Log.java | 30 ++++++++++++++++++++ .../jena/rdf/model/impl/RDFReaderFImpl.java | 4 +-- .../jena/rdf/model/impl/RDFWriterFImpl.java | 4 +-- .../tdb/base/objectfile/ObjectFileStorage.java | 4 +-- .../org/apache/jena/tdb/base/page/PageBase.java | 2 +- .../base/recordbuffer/RecordRangeIterator.java | 2 +- .../tdb/index/bplustree/BPlusTreeParams.java | 2 +- .../java/org/apache/jena/tdb/lib/NodeLib.java | 2 +- .../org/apache/jena/tdb/solver/BindingTDB.java | 2 +- .../jena/tdb/store/nodetable/NodecLib.java | 2 +- .../java/org/apache/jena/tdb/sys/FileRef.java | 2 +- .../java/org/apache/jena/tdb/sys/SystemTDB.java | 2 +- .../jena/tdb/transaction/BlockMgrJournal.java | 6 ++-- .../jena/tdb/transaction/JournalEntryType.java | 2 +- .../tdb/transaction/TransactionManager.java | 4 +-- 26 files changed, 66 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java index c588f1b..805076e 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java +++ b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFactory.java @@ -197,7 +197,7 @@ public class ResultSetFactory { } if (format.equals(ResultsFormat.FMT_TEXT)) { - Log.fatal(ResultSet.class, "Can't read a text result set"); + Log.error(ResultSet.class, "Can't read a text result set"); throw new ResultSetException("Can't read a text result set"); } @@ -229,7 +229,7 @@ public class ResultSetFactory { if (ResultsFormat.isRDFGraphSyntax(format)) return FileManager.get().readModel(model, filenameOrURI); - Log.fatal(ResultSet.class, "Unknown result set syntax: " + format); + Log.error(ResultSet.class, "Unknown result set syntax: " + format); return null; } @@ -255,7 +255,7 @@ public class ResultSetFactory { } if (format.equals(ResultsFormat.FMT_TEXT)) { - Log.fatal(ResultSet.class, "Can't read a text result set"); + Log.error(ResultSet.class, "Can't read a text result set"); throw new ResultSetException("Can't read a text result set"); } @@ -293,7 +293,7 @@ public class ResultSetFactory { return new SPARQLResult(model); } - Log.fatal(ResultSet.class, "Unknown result set syntax: " + format); + Log.error(ResultSet.class, "Unknown result set syntax: " + format); return null; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java b/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java index 021f70d..acd16c5 100644 --- a/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java +++ b/jena-arq/src/main/java/org/apache/jena/query/SortCondition.java @@ -51,7 +51,7 @@ public class SortCondition extends PrintSerializableBase direction = dir ; if ( dir != Query.ORDER_ASCENDING && dir != Query.ORDER_DESCENDING && dir != Query.ORDER_DEFAULT ) - Log.fatal(this, "Unknown sort direction") ; + Log.error(this, "Unknown sort direction") ; } public void format(FmtExprSPARQL fmt, http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterCommonParent.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterCommonParent.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterCommonParent.java index 606c90e..25e02c6 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterCommonParent.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterCommonParent.java @@ -69,7 +69,7 @@ public class QueryIterCommonParent extends QueryIterConvert Log.warn(this, "Binding already for "+v+" (same value)" ) ; else { - Log.fatal(this, "Binding already for "+v+" (different values)" ) ; + Log.error(this, "Binding already for "+v+" (different values)" ) ; throw new ARQInternalErrorException("Incompatible bindings for "+v) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java index d564ce6..f7ce736 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java @@ -41,7 +41,7 @@ public abstract class QueryIterRepeatApply extends QueryIter1 if ( input == null ) { - Log.fatal(this, "[QueryIterRepeatApply] Repeated application to null input iterator") ; + Log.error(this, "[QueryIterRepeatApply] Repeated application to null input iterator") ; return ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java index 6401f11..29f5f68 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java @@ -118,7 +118,7 @@ public abstract class QueryIteratorBase close() ; } catch (QueryFatalException ex) { - Log.fatal(this, "Fatal exception: "+ex.getMessage() ) ; + Log.error(this, "Fatal exception: "+ex.getMessage() ) ; throw ex ; // And pass on up the exception. } return r ; @@ -167,7 +167,7 @@ public abstract class QueryIteratorBase return obj ; } catch (QueryFatalException ex) { - Log.fatal(this, "QueryFatalException", ex) ; + Log.error(this, "QueryFatalException", ex) ; throw ex ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java index edc1fd3..fd07195 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java @@ -42,7 +42,7 @@ public class StageGeneratorGeneric implements StageGenerator { @Override public QueryIterator execute(BasicPattern pattern, QueryIterator input, ExecutionContext execCxt) { if ( input == null ) - Log.fatal(this, "Null input to " + Lib.classShortName(this.getClass())) ; + Log.error(this, "Null input to " + Lib.classShortName(this.getClass())) ; Graph graph = execCxt.getActiveGraph() ; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java index e2dd3da..2514c81 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderProcIndexes.java @@ -41,7 +41,7 @@ public class ReorderProcIndexes implements ReorderProc if ( indexes.length != bgp.size() ) { String str = String.format("Expected size = %d : actual basic pattern size = %d", indexes.length, bgp.size()) ; - Log.fatal(this, str) ; + Log.error(this, str) ; throw new ARQException(str) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java index 1f4e95a..ea17818 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserARQUpdate.java @@ -83,7 +83,7 @@ public class ParserARQUpdate extends UpdateParser } catch (Throwable th) { - Log.fatal(this, "Unexpected throwable: ",th) ; + Log.error(this, "Unexpected throwable: ",th) ; throw new QueryException(th.getMessage(), th) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java index 9712869..cacdeaa 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/ParserSPARQL11Update.java @@ -80,7 +80,7 @@ public class ParserSPARQL11Update extends UpdateParser } catch (Throwable th) { - Log.fatal(this, "Unexpected throwable: ",th) ; + Log.error(this, "Unexpected throwable: ",th) ; throw new QueryException(th.getMessage(), th) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/lib/Metadata.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lib/Metadata.java b/jena-arq/src/main/java/org/apache/jena/sparql/lib/Metadata.java index e9b55ff..b045272 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lib/Metadata.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lib/Metadata.java @@ -68,7 +68,7 @@ public class Metadata if ( classLoader == null ) { - Log.fatal(Metadata.class, "No classloader") ; + Log.error(Metadata.class, "No classloader") ; return ; } @@ -86,7 +86,7 @@ public class Metadata } catch (Throwable ex) { - Log.fatal(Metadata.class, "Unexpected Thorwable", ex) ; + Log.error(Metadata.class, "Unexpected Thorwable", ex) ; return ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementService.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementService.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementService.java index 41a5587..211c3ae 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementService.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementService.java @@ -45,7 +45,7 @@ public class ElementService extends Element public ElementService(Node n, Element el, boolean silent) { if ( ! n.isURI() && ! n.isVariable() ) - Log.fatal(this, "Must be a URI (or variable which will be bound) for a service endpoint") ; + Log.error(this, "Must be a URI (or variable which will be bound) for a service endpoint") ; this.serviceNode = n ; this.element = el ; this.silent = silent ; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java index 8b8398a..a8f6f64 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java @@ -88,22 +88,52 @@ public class Log { log(cls).warn(msg, th) ; } + static public void error(Object caller, String msg) { + error(caller.getClass(), msg) ; + } + + static public void error(Class<? > cls, String msg) { + log(cls).error(msg) ; + } + + static public void error(Object caller, String msg, Throwable th) { + error(caller.getClass(), msg, th) ; + } + + static public void error(Class<? > cls, String msg, Throwable th) { + log(cls).error(msg, th) ; + } + + static public void error(String caller, String msg) { + log(caller).error(msg) ; + } + + /** @deprecated Use {@code error}. */ + @Deprecated static public void fatal(Object caller, String msg) { fatal(caller.getClass(), msg) ; } + /** @deprecated Use {@code error}. */ + @Deprecated static public void fatal(Class<? > cls, String msg) { log(cls).error(msg) ; } + /** @deprecated Use {@code error}. */ + @Deprecated static public void fatal(Object caller, String msg, Throwable th) { fatal(caller.getClass(), msg, th) ; } + /** @deprecated Use {@code error}. */ + @Deprecated static public void fatal(Class<? > cls, String msg, Throwable th) { log(cls).error(msg, th) ; } + /** @deprecated Use {@code error}. */ + @Deprecated static public void fatal(String caller, String msg) { log(caller).error(msg) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java index 4c3eaff..21e3c78 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFReaderFImpl.java @@ -90,7 +90,7 @@ public class RDFReaderFImpl extends Object implements RDFReaderF { @Deprecated public static String setBaseReaderClassName(String lang, String className) { if ( rewiredAlternative != null ) - Log.fatal(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading"); + Log.error(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading"); String oldClassName = currentEntry(lang); try { @@ -152,7 +152,7 @@ public class RDFReaderFImpl extends Object implements RDFReaderF { private static String remove(String lang) { if ( rewiredAlternative != null ) - Log.fatal(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading"); + Log.error(RDFReaderFImpl.class, "Rewired RDFReaderFImpl - configuration changes have no effect on reading"); String oldClassName = currentEntry(lang); custom.remove(lang); http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java index 7f52dc9..74e0c9b 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFWriterFImpl.java @@ -90,7 +90,7 @@ public class RDFWriterFImpl extends Object implements RDFWriterF { @Deprecated public static String setBaseWriterClassName(String lang, String className) { if ( rewiredAlternative != null ) - Log.fatal(RDFWriterFImpl.class, "Rewired RDFWriterFImpl2 - configuration changes have no effect on writing"); + Log.error(RDFWriterFImpl.class, "Rewired RDFWriterFImpl2 - configuration changes have no effect on writing"); String oldClassName = currentEntry(lang); try { @SuppressWarnings("unchecked") @@ -155,7 +155,7 @@ public class RDFWriterFImpl extends Object implements RDFWriterF { private static String remove(String lang) { if ( rewiredAlternative != null ) - Log.fatal(RDFWriterFImpl.class, "Rewired RDFWriterFImpl2 - configuration changes have no effect on writing"); + Log.error(RDFWriterFImpl.class, "Rewired RDFWriterFImpl2 - configuration changes have no effect on writing"); String oldClassName = currentEntry(lang); custom.remove(lang); return oldClassName; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/base/objectfile/ObjectFileStorage.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/objectfile/ObjectFileStorage.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/objectfile/ObjectFileStorage.java index 160383e..8fcd06b 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/objectfile/ObjectFileStorage.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/objectfile/ObjectFileStorage.java @@ -99,7 +99,7 @@ public class ObjectFileStorage implements ObjectFile log("W") ; if ( inAllocWrite ) - Log.fatal(this, "In the middle of an alloc-write") ; + Log.error(this, "In the middle of an alloc-write") ; inAllocWrite = false ; if ( writeBuffer == null ) { @@ -158,7 +158,7 @@ public class ObjectFileStorage implements ObjectFile { //log.info("AW("+bytesSpace+"):"+state()) ; if ( inAllocWrite ) - Log.fatal(this, "In the middle of an alloc-write") ; + Log.error(this, "In the middle of an alloc-write") ; // Include space for length. int spaceRequired = bytesSpace + SizeOfInt ; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/base/page/PageBase.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/page/PageBase.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/page/PageBase.java index 368654b..596dc7f 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/page/PageBase.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/page/PageBase.java @@ -43,7 +43,7 @@ public abstract class PageBase implements Page final public void reset(Block block2) { if ( block2.getId() != id ) - Log.fatal(this, "Block id changed: "+id+" => "+block2.getId()) ; + Log.error(this, "Block id changed: "+id+" => "+block2.getId()) ; _reset(block2) ; this.block = block2 ; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java index f577a57..9c49f7b 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java @@ -37,7 +37,7 @@ class RecordRangeIterator implements Iterator<Record>, Closeable { if ( ! pageMgr.valid(pageId) ) { String msg = "RecordRangeIterator.iterator -- No such block (pageId="+pageId+", fromRec="+fromRec+", toRec="+toRec+ ")" ; - Log.fatal(RecordRangeIterator.class, msg); + Log.error(RecordRangeIterator.class, msg); throw new BlockException(msg) ; } return new RecordRangeIterator(pageId, fromRec, toRec, pageMgr) ; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/index/bplustree/BPlusTreeParams.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/index/bplustree/BPlusTreeParams.java b/jena-tdb/src/main/java/org/apache/jena/tdb/index/bplustree/BPlusTreeParams.java index a12b80a..439819f 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/index/bplustree/BPlusTreeParams.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/index/bplustree/BPlusTreeParams.java @@ -135,7 +135,7 @@ public class BPlusTreeParams return new BPlusTreeParams(pOrder, pKeyLen, pRecLen) ; } catch (NumberFormatException ex) { - Log.fatal(BPlusTreeParams.class, "Badly formed metadata for B+Tree") ; + Log.error(BPlusTreeParams.class, "Badly formed metadata for B+Tree") ; throw new TDBException("Failed to read metadata") ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/lib/NodeLib.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/lib/NodeLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/lib/NodeLib.java index e9cf3e9..8dce3f1 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/lib/NodeLib.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/lib/NodeLib.java @@ -191,7 +191,7 @@ public class NodeLib deallocDigest(digest) ; return ; } - catch (DigestException ex) { Log.fatal(NodeLib.class, "DigestException", ex); } + catch (DigestException ex) { Log.error(NodeLib.class, "DigestException", ex); } } public static NodeId getNodeId(Record r, int idx) http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java index 79bdc04..ec79971 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java @@ -125,7 +125,7 @@ public class BindingTDB extends BindingBase return n ; } catch (Exception ex) { - Log.fatal(this, String.format("get1(%s)", var), ex) ; + Log.error(this, String.format("get1(%s)", var), ex) ; return null ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java index d602388..4cd6979 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java @@ -87,7 +87,7 @@ public class NodecLib return n ; } catch (SSEParseException ex) { - Log.fatal(NodeLib.class, "decode: Failed to parse: "+s) ; + Log.error(NodeLib.class, "decode: Failed to parse: "+s) ; throw ex ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java index db0a8f6..bfdcbeb 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/FileRef.java @@ -133,7 +133,7 @@ public class FileRef FileRef f = id2name.get(fileId) ; if ( f == null ) { - Log.fatal(FileRef.class, "No FileRef registered for id: "+fileId) ; + Log.error(FileRef.class, "No FileRef registered for id: "+fileId) ; throw new TDBException("No FileRef registered for id: "+fileId) ; } return f ; http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java index 1bc728e..37fabbb 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java @@ -247,7 +247,7 @@ public class SystemTDB public static void panic(Class<?> clazz, String string) { - Log.fatal(clazz, string) ; + Log.error(clazz, string) ; throw new TDBException(string) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java index fbc2bdd..7a15c54 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/BlockMgrJournal.java @@ -294,16 +294,16 @@ public class BlockMgrJournal implements BlockMgr, TransactionLifecycle private void checkIfClosed() { if ( closed ) - Log.fatal(this, "Already closed: "+transaction.getTxnId()) ; + Log.error(this, "Already closed: "+transaction.getTxnId()) ; } private void checkActive() { if ( ! active ) - Log.fatal(this, "Not active: "+transaction.getTxnId()) ; + Log.error(this, "Not active: "+transaction.getTxnId()) ; TxnState state = transaction.getState() ; if ( state != TxnState.ACTIVE && state != TxnState.PREPARING ) - Log.fatal(this, "**** Not active: "+transaction.getTxnId()) ; + Log.error(this, "**** Not active: "+transaction.getTxnId()) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/JournalEntryType.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/JournalEntryType.java b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/JournalEntryType.java index c5ce411..f498199 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/JournalEntryType.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/JournalEntryType.java @@ -39,7 +39,7 @@ public enum JournalEntryType else if ( x == Checkpoint.id ) return Checkpoint ; else { - Log.fatal(JournalEntryType.class, "Unknown type: "+x) ; + Log.error(JournalEntryType.class, "Unknown type: "+x) ; throw new InternalErrorException("Unknown type: "+x) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/08747773/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/TransactionManager.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/TransactionManager.java b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/TransactionManager.java index 235f3b9..8d0bee9 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/TransactionManager.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/transaction/TransactionManager.java @@ -750,7 +750,7 @@ public class TransactionManager enactTransaction(txn2) ; commitedAwaitingFlush.remove(txn2) ; } catch (InterruptedException ex) - { Log.fatal(this, "Interruped!", ex) ; } + { Log.error(this, "Interruped!", ex) ; } } checkReplaySafe() ; @@ -894,7 +894,7 @@ public class TransactionManager commitedAwaitingFlush.remove(txn) ; } } catch (InterruptedException ex) - { Log.fatal(this, "Interruped!", ex) ; } + { Log.error(this, "Interruped!", ex) ; } } } }
