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
Unified 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. 197
      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() ) { for ( Entry<Object, EntityEntry> objectEntityEntryEntry : entityEntryContext.reentrantSafeEntityEntries() ) {
// todo : I dont think this need be reentrant safe // 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(); final PersistentAttributeInterceptor interceptor = ( (PersistentAttributeInterceptable) objectEntityEntryEntry.getKey() ).$$_hibernate_getInterceptor();
if ( interceptor instanceof LazyAttributeLoadingInterceptor ) { if ( interceptor instanceof LazyAttributeLoadingInterceptor ) {
( (LazyAttributeLoadingInterceptor) interceptor ).unsetSession(); ( (LazyAttributeLoadingInterceptor) interceptor ).unsetSession();

197
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. * A logging framework wrapper that supports java.util.logging and log4j.
* <P/> * <p/>
* Logger hierarchies are stored at the Class level. * Logger hierarchies are stored at the Class level.
* Log4j will be used if the Log4j system (not necessarily config files) are * Log4j will be used if the Log4j system (not necessarily config files) are
* found in the runtime classpath. * found in the runtime classpath.
* Otherwise, java.util.logging will be used. * Otherwise, java.util.logging will be used.
* <P/> * <p/>
* This is pretty safe because for use cases where multiple hierarchies * This is pretty safe because for use cases where multiple hierarchies
* are desired, classloader hierarchies will effectively isolate multiple * are desired, classloader hierarchies will effectively isolate multiple
* class-level Logger hierarchies. * class-level Logger hierarchies.
* <P/> * <p/>
* Sad as it is, the java.util.logging facility lacks the most basic * Sad as it is, the java.util.logging facility lacks the most basic
* developer-side and configuration-side capabilities. * developer-side and configuration-side capabilities.
* Besides having a non-scalable discovery system, the designers didn't * Besides having a non-scalable discovery system, the designers didn't
* comprehend the need for a level between WARNING and SEVERE! * comprehend the need for a level between WARNING and SEVERE!
* Since we don't want to require log4j in Classpath, we have to live * Since we don't want to require log4j in Classpath, we have to live
* with these constraints. * with these constraints.
* <P/> * <p/>
* As with all the popular logging frameworks, if you want to capture a * As with all the popular logging frameworks, if you want to capture a
* stack trace, you must use the two-parameters logging methods. * stack trace, you must use the two-parameters logging methods.
* I.e., you must also pass a String, or only toString() from your * I.e., you must also pass a String, or only toString() from your
* throwable will be captured. * throwable will be captured.
* <P/> * <p/>
* Usage example:<CODE><PRE> * Usage example:<CODE><PRE>
* private static FrameworkLogger logger = * private static FrameworkLogger logger =
* FrameworkLogger.getLog(SqlTool.class); * FrameworkLogger.getLog(SqlTool.class);
* ... * ...
* logger.finer("Doing something log-worthy"); * logger.finer("Doing something log-worthy");
* </PRE> </CODE> * </PRE> </CODE>
* * <p>
* <p/> * <p/>
* The system level property <code>hsqldb.reconfig_logging=false</code> is * The system level property <code>hsqldb.reconfig_logging=false</code> is
* required to avoid configuration of java.util.logging. Otherwise * required to avoid configuration of java.util.logging. Otherwise
@ -113,17 +113,17 @@ public class FrameworkLogger {
public static synchronized String report() { public static synchronized String report() {
return new StringBuilder().append(loggerInstances.size()).append( return new StringBuilder().append(loggerInstances.size()).append(
" logger instances: ").append( " logger instances: ").append(
loggerInstances.keySet()).toString(); loggerInstances.keySet()).toString();
} }
static private Map loggerInstances = new HashMap(); static private Map loggerInstances = new HashMap();
static private Map jdkToLog4jLevels = new HashMap(); static private Map jdkToLog4jLevels = new HashMap();
static private Method log4jGetLogger; static private Method log4jGetLogger;
static private Method log4jLogMethod; static private Method log4jLogMethod;
static private boolean callerFqcnAvailable = false; static private boolean callerFqcnAvailable = false;
private Object log4jLogger; private Object log4jLogger;
private Logger jdkLogger; private Logger jdkLogger;
// No need for more than one static, since we have only one console // No need for more than one static, since we have only one console
static private boolean noopMode; // If true, then logging calls do nothing static private boolean noopMode; // If true, then logging calls do nothing
@ -131,7 +131,8 @@ public class FrameworkLogger {
static { static {
try { try {
reconfigure(); reconfigure();
} catch (SecurityException e) {} } catch (SecurityException e) {
}
} }
/** /**
@ -148,10 +149,10 @@ public class FrameworkLogger {
*/ */
public static synchronized void clearLoggers(String prefixToZap) { public static synchronized void clearLoggers(String prefixToZap) {
Set targetKeys = new HashSet(); Set targetKeys = new HashSet();
java.util.Iterator it = loggerInstances.keySet().iterator(); java.util.Iterator it = loggerInstances.keySet().iterator();
String k; String k;
String dottedPrefix = prefixToZap + '.'; String dottedPrefix = prefixToZap + '.';
while (it.hasNext()) { while (it.hasNext()) {
k = (String) it.next(); k = (String) it.next();
@ -165,36 +166,36 @@ public class FrameworkLogger {
} }
private static synchronized void private static synchronized void
populateJdkToLog4jLevels(String classString) populateJdkToLog4jLevels(String classString)
throws ClassNotFoundException, IllegalAccessException, throws ClassNotFoundException, IllegalAccessException,
NoSuchMethodException, InvocationTargetException { NoSuchMethodException, InvocationTargetException {
Method log4jToLevel = Class.forName(classString).getMethod( Method log4jToLevel = Class.forName(classString).getMethod(
"toLevel", new Class[]{ String.class }); "toLevel", new Class[]{String.class});
jdkToLog4jLevels.put(Level.ALL, jdkToLog4jLevels.put(Level.ALL,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "ALL" })); new Object[]{"ALL"}));
jdkToLog4jLevels.put(Level.FINER, jdkToLog4jLevels.put(Level.FINER,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "DEBUG" })); new Object[]{"DEBUG"}));
jdkToLog4jLevels.put(Level.WARNING, jdkToLog4jLevels.put(Level.WARNING,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "ERROR" })); new Object[]{"ERROR"}));
jdkToLog4jLevels.put(Level.SEVERE, jdkToLog4jLevels.put(Level.SEVERE,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "FATAL" })); new Object[]{"FATAL"}));
jdkToLog4jLevels.put(Level.INFO, jdkToLog4jLevels.put(Level.INFO,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "INFO" })); new Object[]{"INFO"}));
jdkToLog4jLevels.put(Level.OFF, jdkToLog4jLevels.put(Level.OFF,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "OFF" })); new Object[]{"OFF"}));
jdkToLog4jLevels.put(Level.FINEST, jdkToLog4jLevels.put(Level.FINEST,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "TRACE" })); new Object[]{"TRACE"}));
jdkToLog4jLevels.put(Level.WARNING, jdkToLog4jLevels.put(Level.WARNING,
log4jToLevel.invoke(null, log4jToLevel.invoke(null,
new Object[]{ "WARN" })); new Object[]{"WARN"}));
} }
static void reconfigure() { static void reconfigure() {
@ -207,8 +208,8 @@ public class FrameworkLogger {
loggerInstances.clear(); loggerInstances.clear();
jdkToLog4jLevels.clear(); jdkToLog4jLevels.clear();
log4jGetLogger = null; log4jGetLogger = null;
log4jLogMethod = null; log4jLogMethod = null;
callerFqcnAvailable = false; callerFqcnAvailable = false;
// Precedence: // Precedence:
@ -219,9 +220,9 @@ public class FrameworkLogger {
try { try {
// log4j v2 available? // log4j v2 available?
log4jLoggerClass = Class.forName( log4jLoggerClass = Class.forName(
"org.apache.logging.log4j.Logger"); "com.fr.third.apache.logging.log4j.Logger");
log4jManagerClass = Class.forName( log4jManagerClass = Class.forName(
"org.apache.logging.log4j.LogManager"); "com.fr.third.apache.logging.log4j.LogManager");
} catch (Exception e) { } catch (Exception e) {
// The class will only load successfully if Log4j v2 thinks it is // The class will only load successfully if Log4j v2 thinks it is
@ -232,15 +233,15 @@ public class FrameworkLogger {
// Attempt to configure log4j v2 // Attempt to configure log4j v2
if (log4jLoggerClass != null) { if (log4jLoggerClass != null) {
try { try {
populateJdkToLog4jLevels("org.apache.logging.log4j.Level"); populateJdkToLog4jLevels("com.fr.third.apache.logging.log4j.Level");
log4jLogMethod = log4jLoggerClass.getMethod("log", log4jLogMethod = log4jLoggerClass.getMethod("log",
new Class[] { new Class[]{
Class.forName("org.apache.logging.log4j.Level"), Class.forName("com.fr.third.apache.logging.log4j.Level"),
Object.class, Throwable.class Object.class, Throwable.class
}); });
log4jGetLogger = log4jManagerClass.getMethod("getLogger", log4jGetLogger = log4jManagerClass.getMethod("getLogger",
new Class[]{ String.class }); new Class[]{String.class});
// This last object is what we toggle on to generate either // This last object is what we toggle on to generate either
// Log4j or Jdk Logger objects (to wrap). // Log4j or Jdk Logger objects (to wrap).
@ -251,8 +252,8 @@ public class FrameworkLogger {
// successfully initialized with warnings due to bad config). // successfully initialized with warnings due to bad config).
try { try {
System.err.println( System.err.println(
"<clinit> failure " "<clinit> failure "
+ "instantiating configured Log4j v2 system: " + e); + "instantiating configured Log4j v2 system: " + e);
// It's possible we don't have write access to System.err. // It's possible we don't have write access to System.err.
} catch (Throwable t) { } catch (Throwable t) {
@ -266,13 +267,13 @@ public class FrameworkLogger {
// Reset // Reset
log4jLoggerClass = null; log4jLoggerClass = null;
log4jManagerClass = null; log4jManagerClass = null;
log4jLogMethod = null; log4jLogMethod = null;
log4jGetLogger = null; log4jGetLogger = null;
jdkToLog4jLevels.clear(); jdkToLog4jLevels.clear();
try { try {
// log4j v1 available? // log4j v1 available?
log4jLoggerClass = Class.forName("org.apache.log4j.Logger"); log4jLoggerClass = Class.forName("com.fr.third.apache.log4j.Logger");
log4jManagerClass = log4jLoggerClass; log4jManagerClass = log4jLoggerClass;
} catch (Exception e) { } catch (Exception e) {
@ -284,15 +285,15 @@ public class FrameworkLogger {
// Attempt to configure log4j v1 // Attempt to configure log4j v1
if (log4jLoggerClass != null) { if (log4jLoggerClass != null) {
try { try {
populateJdkToLog4jLevels("org.apache.log4j.Level"); populateJdkToLog4jLevels("com.fr.third.apache.log4j.Level");
log4jLogMethod = log4jLoggerClass.getMethod("log", log4jLogMethod = log4jLoggerClass.getMethod("log",
new Class[] { new Class[]{
String.class, Class.forName("org.apache.log4j.Priority"), String.class, Class.forName("com.fr.third.apache.log4j.Priority"),
Object.class, Throwable.class Object.class, Throwable.class
}); });
log4jGetLogger = log4jManagerClass.getMethod("getLogger", log4jGetLogger = log4jManagerClass.getMethod("getLogger",
new Class[]{ String.class }); new Class[]{String.class});
// This last object is what we toggle on to generate either // This last object is what we toggle on to generate either
// Log4j or Jdk Logger objects (to wrap). // Log4j or Jdk Logger objects (to wrap).
callerFqcnAvailable = true; callerFqcnAvailable = true;
@ -304,8 +305,8 @@ public class FrameworkLogger {
// successfully initialized with warnings due to bad config). // successfully initialized with warnings due to bad config).
try { try {
System.err.println( System.err.println(
"<clinit> failure " "<clinit> failure "
+ "instantiating configured Log4j v1 system: " + e); + "instantiating configured Log4j v1 system: " + e);
// It's possible we don't have write access to System.err. // It's possible we don't have write access to System.err.
} catch (Throwable t) { } catch (Throwable t) {
@ -319,8 +320,8 @@ public class FrameworkLogger {
// Reset // Reset
log4jLoggerClass = null; log4jLoggerClass = null;
log4jManagerClass = null; log4jManagerClass = null;
log4jLogMethod = null; log4jLogMethod = null;
log4jGetLogger = null; log4jGetLogger = null;
callerFqcnAvailable = false; callerFqcnAvailable = false;
jdkToLog4jLevels.clear(); jdkToLog4jLevels.clear();
@ -343,14 +344,14 @@ public class FrameworkLogger {
ConsoleHandler consoleHandler = new ConsoleHandler(); ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setFormatter( consoleHandler.setFormatter(
new BasicTextJdkLogFormatter(false)); new BasicTextJdkLogFormatter(false));
consoleHandler.setLevel(Level.INFO); consoleHandler.setLevel(Level.INFO);
istream = FrameworkLogger.class.getResourceAsStream(path); istream = FrameworkLogger.class.getResourceAsStream(path);
lm.readConfiguration(istream); lm.readConfiguration(istream);
Logger cmdlineLogger = Logger.getLogger("org.hsqldb.cmdline"); Logger cmdlineLogger = Logger.getLogger("com.fr.third.org.hsqldb.cmdline");
cmdlineLogger.addHandler(consoleHandler); cmdlineLogger.addHandler(consoleHandler);
cmdlineLogger.setUseParentHandlers(false); cmdlineLogger.setUseParentHandlers(false);
@ -371,8 +372,8 @@ public class FrameworkLogger {
noopMode = true; noopMode = true;
System.err.println( System.err.println(
"<clinit> failure initializing JDK logging system. " "<clinit> failure initializing JDK logging system. "
+ "Continuing without Application logging."); + "Continuing without Application logging.");
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
if (istream != null) { if (istream != null) {
@ -380,7 +381,7 @@ public class FrameworkLogger {
istream.close(); istream.close();
} catch (IOException ioe) { } catch (IOException ioe) {
System.err.println("Failed to close logging input stream: " System.err.println("Failed to close logging input stream: "
+ ioe); + ioe);
} }
} }
} }
@ -397,10 +398,10 @@ public class FrameworkLogger {
} else { } else {
try { try {
log4jLogger = log4jGetLogger.invoke(null, log4jLogger = log4jGetLogger.invoke(null,
new Object[]{ s }); new Object[]{s});
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException( throw new RuntimeException(
"Failed to instantiate Log4j Logger", e); "Failed to instantiate Log4j Logger", e);
} }
} }
} }
@ -412,7 +413,7 @@ public class FrameworkLogger {
/** /**
* User's entry-point into this logging system. * User's entry-point into this logging system.
* <P/> * <p/>
* You normally want to work with static (class-level) pointers to * You normally want to work with static (class-level) pointers to
* logger instances, for performance efficiency. * logger instances, for performance efficiency.
* See the class-level JavaDoc for a usage example. * See the class-level JavaDoc for a usage example.
@ -431,7 +432,7 @@ public class FrameworkLogger {
*/ */
public static FrameworkLogger getLog(Class c, String contextId) { public static FrameworkLogger getLog(Class c, String contextId) {
return (contextId == null) ? getLog(c) return (contextId == null) ? getLog(c)
: getLog(contextId + '.' + c.getName()); : getLog(contextId + '.' + c.getName());
} }
/** /**
@ -442,7 +443,7 @@ public class FrameworkLogger {
*/ */
public static FrameworkLogger getLog(String baseId, String contextId) { public static FrameworkLogger getLog(String baseId, String contextId) {
return (contextId == null) ? getLog(baseId) return (contextId == null) ? getLog(baseId)
: getLog(contextId + '.' + baseId); : getLog(contextId + '.' + baseId);
} }
/** /**
@ -465,9 +466,9 @@ public class FrameworkLogger {
* Just like FrameworkLogger.log(Level, String), * Just like FrameworkLogger.log(Level, String),
* but also logs a stack trace. * but also logs a stack trace.
* *
* @param level java.util.logging.Level level to filter and log at * @param level java.util.logging.Level level to filter and log at
* @param message Message to be logged * @param message Message to be logged
* @param t Throwable whose stack trace will be logged. * @param t Throwable whose stack trace will be logged.
* @see #log(Level, String) * @see #log(Level, String)
* @see Logger#log(Level, String) * @see Logger#log(Level, String)
* @see Level * @see Level
@ -492,8 +493,8 @@ public class FrameworkLogger {
if (log4jLogger == null) { if (log4jLogger == null) {
StackTraceElement[] elements = new Throwable().getStackTrace(); StackTraceElement[] elements = new Throwable().getStackTrace();
String c = ""; String c = "";
String m = ""; String m = "";
if (elements.length > revertMethods) { if (elements.length > revertMethods) {
c = elements[revertMethods].getClassName(); c = elements[revertMethods].getClassName();
@ -508,15 +509,15 @@ public class FrameworkLogger {
} else { } else {
try { try {
log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable
? new Object[] { ? new Object[]{
skipClass.getName(), jdkToLog4jLevels.get(level), skipClass.getName(), jdkToLog4jLevels.get(level),
message, t} message, t}
: new Object[] { : new Object[]{
jdkToLog4jLevels.get(level), message, t} jdkToLog4jLevels.get(level), message, t}
); );
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException( throw new RuntimeException(
"Logging failed when attempting to log: " + message, e); "Logging failed when attempting to log: " + message, e);
} }
} }
} }
@ -539,17 +540,17 @@ public class FrameworkLogger {
} else { } else {
try { try {
log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable log4jLogMethod.invoke(log4jLogger, callerFqcnAvailable
? new Object[] { ? new Object[]{
FrameworkLogger.class.getName(), FrameworkLogger.class.getName(),
jdkToLog4jLevels.get(level), message, null} jdkToLog4jLevels.get(level), message, null}
: new Object[] { : new Object[]{
jdkToLog4jLevels.get(level), message, null} jdkToLog4jLevels.get(level), message, null}
); );
// Test where SqlFile correct here. // Test where SqlFile correct here.
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException( throw new RuntimeException(
"Logging failed when attempting to log: " + message, e); "Logging failed when attempting to log: " + message, e);
} }
} }
} }
@ -557,7 +558,7 @@ public class FrameworkLogger {
// Wrappers // Wrappers
/** /**
* @param level java.util.logging.Level level to filter and log at * @param level java.util.logging.Level level to filter and log at
* @param message Message to be logged * @param message Message to be logged
* @see Logger#log(Level, String) * @see Logger#log(Level, String)
* @see Level * @see Level
@ -679,21 +680,21 @@ public class FrameworkLogger {
/** /**
* Whether this JVM is configured with java.util.logging defaults. * Whether this JVM is configured with java.util.logging defaults.
* * <p>
* If the JRE-provided config file is not in the expected place, then * If the JRE-provided config file is not in the expected place, then
* we return false. * we return false.
*/ */
public static boolean isDefaultJdkConfig() { public static boolean isDefaultJdkConfig() {
File globalCfgFile = new File(System.getProperty("java.home"), File globalCfgFile = new File(System.getProperty("java.home"),
"lib/logging.properties"); "lib/logging.properties");
if (!globalCfgFile.isFile()) { if (!globalCfgFile.isFile()) {
return false; return false;
} }
FileInputStream fis = null; FileInputStream fis = null;
LogManager lm = LogManager.getLogManager(); LogManager lm = LogManager.getLogManager();
try { try {
fis = new FileInputStream(globalCfgFile); fis = new FileInputStream(globalCfgFile);
@ -703,14 +704,14 @@ public class FrameworkLogger {
defaultProps.load(fis); defaultProps.load(fis);
Enumeration names = defaultProps.propertyNames(); Enumeration names = defaultProps.propertyNames();
int i = 0; int i = 0;
String name; String name;
String liveVal; String liveVal;
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
i++; i++;
name = (String) names.nextElement(); name = (String) names.nextElement();
liveVal = lm.getProperty(name); liveVal = lm.getProperty(name);
if (liveVal == null) { if (liveVal == null) {

Write Preview
Loading…
Cancel
Save