[db-jdo] 14/18: JDO-823: Local variables should not be declared and then immediately returned or thrown

[mb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch JDO-823-2
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 7731ddaff50ff01e92f9d7619c6df77d4ece6979
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Jan 7 21:57:00 2023 +0100

    JDO-823: Local variables should not be declared and then immediately returned or thrown
---
 api/src/main/java/javax/jdo/JDOHelper.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index 1d205b20..ccffd5a2 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -748,10 +748,8 @@ public class JDOHelper implements Constants {
             pmfClassName = getClassNameFromURL(urls.nextElement());
 
             // return the implementation that is valid.
-            PersistenceManagerFactory pmf =
-                invokeGetPersistenceManagerFactoryOnImplementation(
-                    pmfClassName, overrides, props, pmfClassLoader);
-            return pmf;
+            return invokeGetPersistenceManagerFactoryOnImplementation(
+                pmfClassName, overrides, props, pmfClassLoader);
 
           } catch (Throwable ex) {
 
@@ -1657,8 +1655,7 @@ public class JDOHelper implements Constants {
           try {
             String enhancerClassName = getClassNameFromURL(urls.nextElement());
             Class<?> enhancerClass = forName(enhancerClassName, true, ctrLoader);
-            JDOEnhancer enhancer = (JDOEnhancer) enhancerClass.newInstance();
-            return enhancer;
+            return (JDOEnhancer) enhancerClass.newInstance();
           } catch (Throwable ex) {
             // remember exceptions from failed enhancer invocations
             exceptions.add(ex);