diff --git a/src/java/com/mchange/v2/c3p0/cfg/C3P0Config.java b/src/java/com/mchange/v2/c3p0/cfg/C3P0Config.java index 80ffe8f0..b25d9944 100644 --- a/src/java/com/mchange/v2/c3p0/cfg/C3P0Config.java +++ b/src/java/com/mchange/v2/c3p0/cfg/C3P0Config.java @@ -189,9 +189,19 @@ private static C3P0Config findLibraryC3P0Config( boolean warn_on_conflicting_ove } catch (Exception e) { - - if ( logger.isLoggable(MLevel.WARNING) ) - logger.log( MLevel.WARNING, "XML configuration disabled! Verify that standard XML libs are available.", e); + if ( e instanceof ClassNotFoundException ) + { + if ( logger.isLoggable(MLevel.WARNING) ) + logger.log( MLevel.WARNING, "XML configuration disabled! Verify that standard XML libs are available.", e); + } + else + { + if ( logger.isLoggable(MLevel.SEVERE) ) + { + logger.log( MLevel.SEVERE, "An error occurred while trying to parse the XML configuration!" ); + logger.log( MLevel.SEVERE, "XML CONFIGURATION IGNORED!", e); + } + } HashMap flatDefaults = C3P0ConfigUtils.extractHardcodedC3P0Defaults(); flatDefaults.putAll( C3P0ConfigUtils.extractC3P0PropertiesResources() ); diff --git a/src/test-properties/c3p0.properties b/src/test-properties/c3p0.properties index 8834759d..a1a5298c 100644 --- a/src/test-properties/c3p0.properties +++ b/src/test-properties/c3p0.properties @@ -58,6 +58,9 @@ com.mchange.v2.log.MLog=slf4j #com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL=ALL #com.mchange.v2.log.jdk14logging.suppressStackWalk=true +#com.mchange.v2.c3p0.cfg.xml.usePermissiveParser=true +#com.mchange.v2.c3p0.cfg.xml.expandEntityReferences=true + #com.mchange.v2.c3p0.VMID=poop #com.mchange.v2.resourcepool.experimental.useScatteredAcquireTask=false