aboutsummaryrefslogtreecommitdiff
path: root/common/src
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-04-02 12:03:29 +0200
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-04-02 12:03:29 +0200
commit4b890232cc2ef904ede71663abb4fb5f3d8be7e8 (patch)
tree4421b954168090878a0341ee3eba31d7b3906212 /common/src
parent758b9760bc018319eec916103e5e73385c2a4c4b (diff)
parent07e74546f01f69545b77518e0e651b43a4e04e91 (diff)
downloadmoa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.tar.gz
moa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.tar.bz2
moa-id-spss-4b890232cc2ef904ede71663abb4fb5f3d8be7e8.zip
Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into vidp_2.1_bs
Diffstat (limited to 'common/src')
-rw-r--r--common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
index c2f2c9f47..246b0eb31 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
@@ -53,6 +53,7 @@ import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
+import at.gv.egovernment.moa.logging.Logger;
import at.gv.egovernment.moa.util.ex.EgovUtilException;
@@ -67,8 +68,6 @@ public class MiscUtil {
public static final String DEFAULT_SLASH = "/";
- public static Log log = LogFactory.getLog(MiscUtil.class);
-
private static final int IO_BUFFER_SIZE = 4 * 1024;
public static void copyStream(InputStream is, OutputStream os) throws IOException {
@@ -303,7 +302,7 @@ public class MiscUtil {
try {
return sdf.parse(dateString);
} catch (ParseException e) {
- log.warn(null, "Error parsing date.", e);
+ Logger.warn("Error parsing date.", e);
return null;
}
}