mirror of https://github.com/apache/openjpa.git
back out last getLog() additions, which caused failures on when not using Derby
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@813568 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b5fabd88dd
commit
fa49080f8f
|
@ -48,7 +48,7 @@ public class TestMultipleSchemaNames extends SingleEMFTestCase {
|
||||||
org.apache.openjpa.jdbc.sql.OracleDictionary.class,
|
org.apache.openjpa.jdbc.sql.OracleDictionary.class,
|
||||||
org.apache.openjpa.jdbc.sql.SQLServerDictionary.class);
|
org.apache.openjpa.jdbc.sql.SQLServerDictionary.class);
|
||||||
if (isTestsDisabled()) {
|
if (isTestsDisabled()) {
|
||||||
getLog().trace("TestMultipleSchemaNames() - Skipping all tests - Not supported on this DB");
|
// getLog().trace("TestMultipleSchemaNames() - Skipping all tests - Not supported on this DB");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -206,19 +206,7 @@ public abstract class SingleEMFTestCase
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Log getLog() {
|
protected Log getLog() {
|
||||||
return getLog("Tests");
|
return emf.getConfiguration().getLog("Tests");
|
||||||
}
|
|
||||||
|
|
||||||
protected Log getLog(String s) {
|
|
||||||
OpenJPAEntityManagerFactorySPI tempEMF = emf;
|
|
||||||
if (tempEMF == null) {
|
|
||||||
tempEMF = createEMF();
|
|
||||||
}
|
|
||||||
Log log = emf.getConfiguration().getLog(s);
|
|
||||||
if (emf == null) {
|
|
||||||
closeEMF(tempEMF);
|
|
||||||
}
|
|
||||||
return log;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue