This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 166a16e73a1 Rename return parameter to result (#28630)
166a16e73a1 is described below
commit 166a16e73a1255ef3fde1acee126e6090d545744
Author: yx9o <[email protected]>
AuthorDate: Wed Oct 4 00:06:32 2023 +0800
Rename return parameter to result (#28630)
---
.../repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
index 94b72e46f79..172b8cd8ba5 100644
---
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
+++
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
@@ -101,7 +101,7 @@ public final class JDBCRepositorySQLLoader {
}
private static JDBCRepositorySQL loadFromJar(final URL url, final String
type) throws JAXBException, IOException {
- JDBCRepositorySQL defaultProvider = null;
+ JDBCRepositorySQL result = null;
try (JarFile jar = ((JarURLConnection)
url.openConnection()).getJarFile()) {
Enumeration<JarEntry> entries = jar.entries();
while (entries.hasMoreElements()) {
@@ -112,13 +112,14 @@ public final class JDBCRepositorySQLLoader {
final InputStream inputStream =
Thread.currentThread().getContextClassLoader().getResourceAsStream(name);
JDBCRepositorySQL provider = (JDBCRepositorySQL)
JAXBContext.newInstance(JDBCRepositorySQL.class).createUnmarshaller().unmarshal(inputStream);
if (provider.isDefault()) {
- defaultProvider = provider;
+ result = provider;
}
if (Objects.equals(provider.getType(), type)) {
- return provider;
+ result = provider;
+ break;
}
}
}
- return defaultProvider;
+ return result;
}
}