opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #8822 in CORE/base-third from bugfix/11.0 to release/11.0 

* commit '7178540ccda2b1ee4f661279349e44170d78f3eb':
  REPORT-94814 备份还原报错npe
  REPORT-93688 REPORT-94439 创建hsql连接超时
  REPORT-93688 REPORT-94439 创建hsql连接超时
release/11.0
superman 2 years ago
parent
0537d7d8dd 7178540ccd
commit
d85cf5f6b4
2 changed files with 100 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      fine-hibernate/src/main/java/com/fr/third/org/hibernate/engine/internal/StatefulPersistenceContext.java
  2. 71
      fine-hsqldb/src/main/java/com/fr/third/org/hsqldb/lib/FrameworkLogger.java

2
fine-hibernate/src/main/java/com/fr/third/org/hibernate/engine/internal/StatefulPersistenceContext.java
Unescape View File

@ -223,7 +223,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
for ( Entry<Object, EntityEntry> objectEntityEntryEntry : entityEntryContext.reentrantSafeEntityEntries() ) {
// todo : I dont think this need be reentrant safe
if ( objectEntityEntryEntry.getKey() instanceof PersistentAttributeInterceptable ) {
if ( objectEntityEntryEntry != null && objectEntityEntryEntry.getKey() instanceof PersistentAttributeInterceptable ) {
final PersistentAttributeInterceptor interceptor = ( (PersistentAttributeInterceptable) objectEntityEntryEntry.getKey() ).$$_hibernate_getInterceptor();
if ( interceptor instanceof LazyAttributeLoadingInterceptor ) {
( (LazyAttributeLoadingInterceptor) interceptor ).unsetSession();

71
fine-hsqldb/src/main/java/com/fr/third/org/hsqldb/lib/FrameworkLogger.java
Unescape View File

@ -50,35 +50,35 @@ import java.lang.reflect.InvocationTargetException;
/**
* A logging framework wrapper that supports java.util.logging and log4j.
* <P/>
* <p/>
* Logger hierarchies are stored at the Class level.
* Log4j will be used if the Log4j system (not necessarily config files) are
* found in the runtime classpath.
* Otherwise, java.util.logging will be used.
* <P/>
* <p/>
* This is pretty safe because for use cases where multiple hierarchies
* are desired, classloader hierarchies will effectively isolate multiple
* class-level Logger hierarchies.
* <P/>
* <p/>
* Sad as it is, the java.util.logging facility lacks the most basic
* developer-side and configuration-side capabilities.
* Besides having a non-scalable discovery system, the designers didn't
* comprehend the need for a level between WARNING and SEVERE!
* Since we don't want to require log4j in Classpath, we have to live
* with these constraints.
* <P/>
* <p/>
* As with all the popular logging frameworks, if you want to capture a
* stack trace, you must use the two-parameters logging methods.
* I.e., you must also pass a String, or only toString() from your
* throwable will be captured.
* <P/>
* <p/>
* Usage example:<CODE><PRE>
* private static FrameworkLogger logger =
* FrameworkLogger.getLog(SqlTool.class);
* ...
* logger.finer("Doing something log-worthy");
* </PRE> </CODE>
*
* <p>
* <p/>
* The system level property <code>hsqldb.reconfig_logging=false</code> is
* required to avoid configuration of java.util.logging. Otherwise
@ -131,7 +131,8 @@ public class FrameworkLogger {
static {
try {
reconfigure();
} catch (SecurityException e) {}
} catch (SecurityException e) {
}
}
/**
@ -169,32 +170,32 @@ public class FrameworkLogger {
throws ClassNotFoundException, IllegalAccessException,
NoSuchMethodException, InvocationTargetException {
Method log4jToLevel = Class.forName(classString).getMethod(
"toLevel", new Class[]{ String.class });
"toLevel", new Class[]{String.class});
jdkToLog4jLevels.put(Level.ALL,
log4jToLevel.invoke(null,
new Object[]{ "ALL" }));
new Object[]{"ALL"}));
jdkToLog4jLevels.put(Level.FINER,
log4jToLevel.invoke(null,
new Object[]{ "DEBUG" }));
new Object[]{"DEBUG"}));
jdkToLog4jLevels.put(Level.WARNING,
log4jToLevel.invoke(null,
new Object[]{ "ERROR" }));
new Object[]{"ERROR"}));
jdkToLog4jLevels.put(Level.SEVERE,
log4jToLevel.invoke(null,
new Object[]{ "FATAL" }));
new Object[]{"FATAL"}));
jdkToLog4jLevels.put(Level.INFO,
log4jToLevel.invoke(null,
new Object[]{ "INFO" }));
new Object[]{"INFO"}));
jdkToLog4jLevels.put(Level.OFF,
log4jToLevel.invoke(null,
new Object[]{ "OFF" }));
new Object[]{"OFF"}));
jdkToLog4jLevels.put(Level.FINEST,
log4jToLevel.invoke(null,
new Object[]{ "TRACE" }));
new Object[]{"TRACE"}));
jdkToLog4jLevels.put(Level.WARNING,
log4jToLevel.invoke(null,
new Object[]{ "WARN" }));
new Object[]{"WARN"}));
}
static void reconfigure() {
@ -219,9 +220,9 @@ public class FrameworkLogger {
try {
// log4j v2 available?
log4jLoggerClass = Class.forName(
"org.apache.logging.log4j.Logger");
"com.fr.third.apache.logging.log4j.Logger");
log4jManagerClass = Class.forName(
"org.apache.logging.log4j.LogManager");
"com.fr.third.apache.logging.log4j.LogManager");
} catch (Exception e) {
// The class will only load successfully if Log4j v2 thinks it is
@ -232,15 +233,15 @@ public class FrameworkLogger {
// Attempt to configure log4j v2
if (log4jLoggerClass != null) {
try {
populateJdkToLog4jLevels("org.apache.logging.log4j.Level");
populateJdkToLog4jLevels("com.fr.third.apache.logging.log4j.Level");
log4jLogMethod = log4jLoggerClass.getMethod("log",
new Class[] {
Class.forName("org.apache.logging.log4j.Level"),
new Class[]{
Class.forName("com.fr.third.apache.logging.log4j.Level"),
Object.class, Throwable.class
});
log4jGetLogger = log4jManagerClass.getMethod("getLogger",
new Class[]{ String.class });
new Class[]{String.class});
// This last object is what we toggle on to generate either
// Log4j or Jdk Logger objects (to wrap).
@ -272,7 +273,7 @@ public class FrameworkLogger {
try {
// log4j v1 available?
log4jLoggerClass = Class.forName("org.apache.log4j.Logger");
log4jLoggerClass = Class.forName("com.fr.third.apache.log4j.Logger");
log4jManagerClass = log4jLoggerClass;
} catch (Exception e) {
@ -284,15 +285,15 @@ public class FrameworkLogger {
// Attempt to configure log4j v1
if (log4jLoggerClass != null) {
try {
populateJdkToLog4jLevels("org.apache.log4j.Level");
populateJdkToLog4jLevels("com.fr.third.apache.log4j.Level");
log4jLogMethod = log4jLoggerClass.getMethod("log",
new Class[] {
String.class, Class.forName("org.apache.log4j.Priority"),
new Class[]{
String.class, Class.forName("com.fr.third.apache.log4j.Priority"),
Object.class, Throwable.class
});
log4jGetLogger = log4jManagerClass.getMethod("getLogger",
new Class[]{ String.class });
new Class[]{String.class});
// This last object is what we toggle on to generate either
// Log4j or Jdk Logger objects (to wrap).
callerFqcnAvailable = true;
@ -350,7 +351,7 @@ public class FrameworkLogger {
lm.readConfiguration(istream);
Logger cmdlineLogger = Logger.getLogger("org.hsqldb.cmdline");
Logger cmdlineLogger = Logger.getLogger("com.fr.third.org.hsqldb.cmdline");
cmdlineLogger.addHandler(consoleHandler);
cmdlineLogger.setUseParentHandlers(false);
@ -397,7 +398,7 @@ public class FrameworkLogger {
} else {
try {
log4jLogger = log4jGetLogger.invoke(null,
new Object[]{ s });
new Object[]{s});
} catch (Exception e) {
throw new RuntimeException(
"Failed to instantiate Log4j Logger", e);
@ -412,7 +413,7 @@ public class FrameworkLogger {
/**
* User's entry-point into this logging system.
* <P/>
* <p/>
* You normally want to work with static (class-level) pointers to
* logger instances, for performance efficiency.
* See the class-level JavaDoc for a usage example.
@ -508,10 +509,10 @@ public class FrameworkLogger {
} else {
try {
log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable
? new Object[] {
? new Object[]{
skipClass.getName(), jdkToLog4jLevels.get(level),
message, t}
: new Object[] {
: new Object[]{
jdkToLog4jLevels.get(level), message, t}
);
} catch (Exception e) {
@ -539,10 +540,10 @@ public class FrameworkLogger {
} else {
try {
log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable
? new Object[] {
? new Object[]{
FrameworkLogger.class.getName(),
jdkToLog4jLevels.get(level), message, null}
: new Object[] {
: new Object[]{
jdkToLog4jLevels.get(level), message, null}
);
@ -679,7 +680,7 @@ public class FrameworkLogger {
/**
* Whether this JVM is configured with java.util.logging defaults.
*
* <p>
* If the JRE-provided config file is not in the expected place, then
* we return false.
*/

Write Preview
Loading…
Cancel
Save