root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Defensively handle DatabaseMetaData.getConnection() returning null 

Issue: SPR-16495
This commit is contained in:
Juergen Hoeller 2018-02-14 14:40:52 +01:00
parent 7826567df6
commit 766e6028d7
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,7 +44,7 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
private final boolean includeSynonyms; private final boolean includeSynonyms;
@Nullable @Nullable
private String defaultSchema; private final String defaultSchema;
/** /**
@ -65,23 +65,27 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
super(databaseMetaData); super(databaseMetaData);
this.includeSynonyms = includeSynonyms; this.includeSynonyms = includeSynonyms;
this.defaultSchema = lookupDefaultSchema(databaseMetaData);
lookupDefaultSchema(databaseMetaData);
} }
/* /*
* Oracle-based implementation for detecting the current schema. * Oracle-based implementation for detecting the current schema.
*/ */
private void lookupDefaultSchema(DatabaseMetaData databaseMetaData) { @Nullable
private static String lookupDefaultSchema(DatabaseMetaData databaseMetaData) {
try { try {
CallableStatement cstmt = null; CallableStatement cstmt = null;
try { try {
cstmt = databaseMetaData.getConnection().prepareCall( Connection con = databaseMetaData.getConnection();
"{? = call sys_context('USERENV', 'CURRENT_SCHEMA')}"); if (con == null) {
logger.debug("Cannot check default schema - no Connection from DatabaseMetaData");
return null;
}
cstmt = con.prepareCall("{? = call sys_context('USERENV', 'CURRENT_SCHEMA')}");
cstmt.registerOutParameter(1, Types.VARCHAR); cstmt.registerOutParameter(1, Types.VARCHAR);
cstmt.execute(); cstmt.execute();
this.defaultSchema = cstmt.getString(1); return cstmt.getString(1);
} }
finally { finally {
if (cstmt != null) { if (cstmt != null) {
@ -90,7 +94,8 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
} }
} }
catch (SQLException ex) { catch (SQLException ex) {
logger.debug("Encountered exception during default schema lookup", ex); logger.debug("Exception encountered during default schema lookup", ex);
return null;
} }
} }
@ -116,6 +121,12 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
} }
Connection con = databaseMetaData.getConnection(); Connection con = databaseMetaData.getConnection();
if (con == null) {
logger.warn("Unable to include synonyms in table metadata lookup - no Connection from DatabaseMetaData");
super.initializeWithTableColumnMetaData(databaseMetaData, catalogName, schemaName, tableName);
return;
}
try { try {
Class<?> oracleConClass = con.getClass().getClassLoader().loadClass("oracle.jdbc.OracleConnection"); Class<?> oracleConClass = con.getClass().getClassLoader().loadClass("oracle.jdbc.OracleConnection");
con = (Connection) con.unwrap(oracleConClass); con = (Connection) con.unwrap(oracleConClass);
@ -133,7 +144,7 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
Boolean originalValueForIncludeSynonyms; Boolean originalValueForIncludeSynonyms;
try { try {
Method getIncludeSynonyms = con.getClass().getMethod("getIncludeSynonyms", (Class[]) null); Method getIncludeSynonyms = con.getClass().getMethod("getIncludeSynonyms");
ReflectionUtils.makeAccessible(getIncludeSynonyms); ReflectionUtils.makeAccessible(getIncludeSynonyms);
originalValueForIncludeSynonyms = (Boolean) getIncludeSynonyms.invoke(con); originalValueForIncludeSynonyms = (Boolean) getIncludeSynonyms.invoke(con);