X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FCacheEntryBase.java;h=5776857d330ad98374d9b8c07d575ddb0118f7b2;hb=e19c37f84fd1ce2d946578f7c05f3e45444ba67a;hp=31b585aaeeccd43cb2089ebe254d680c314a709b;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java index 31b585aae..5776857d3 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java @@ -14,14 +14,17 @@ package org.simantics.db.impl.query; import java.util.ArrayList; import java.util.Iterator; -import org.simantics.db.common.utils.Logger; import org.simantics.db.exception.DatabaseException; import org.simantics.db.impl.DebugPolicy; import org.simantics.db.impl.graph.ReadGraphImpl; import org.simantics.db.impl.procedure.InternalProcedure; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract public class CacheEntryBase extends CacheEntry { + private static final Logger LOGGER = LoggerFactory.getLogger(CacheEntryBase.class); + // Default level is something that is not quite a prospect but still allows for ordering within CacheCollectionResult public static final short UNDEFINED_LEVEL = 5; @@ -108,7 +111,7 @@ abstract public class CacheEntryBase extends CacheEntry { statusOrException = EXCEPTED; result = t; } else { - Logger.defaultLogError("Cache entry got excepted status after being discarded: " + getClass().getSimpleName(), t); + LOGGER.warn("Cache entry got excepted status after being discarded: " + getClass().getSimpleName(), t); result = t; } } @@ -139,7 +142,7 @@ abstract public class CacheEntryBase extends CacheEntry { final public boolean assertPending() { boolean result = isPending(); if(!result) { - System.err.println("Assertion failed, expected pending, got " + statusOrException); + LOGGER.warn("Assertion failed, expected pending, got " + statusOrException); } return result; }