SQLTraceListener: Cleanup code base on review

eclipse-ee4j · Aug 19, 2024 · 3ebd319 · 3ebd319
1 parent 212540a
commit 3ebd319
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...ectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java b/...ectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java
@@ -394,15 +394,11 @@ protected ManagedConnectionFactory instantiateMCF(String mcfClassName, ClassLoad
         Class<?> mcfClass;
         if (jcl_ != null) {
             mcfClass = jcl_.loadClass(mcfClassName);
-//            mcf = (ManagedConnectionFactory) mcfClass.getDeclaredConstructor().newInstance();
         } else if (loader != null) {
             mcfClass = loader.loadClass(mcfClassName);
-//            mcf = (ManagedConnectionFactory) loader.loadClass(mcfClass).getDeclaredConstructor().newInstance();
+
         } else {
             mcfClass = Thread.currentThread().getContextClassLoader().loadClass(mcfClassName);
-            // mcf = (ManagedConnectionFactory) Class.forName(mcfClass).newInstance();
-//            mcf = (ManagedConnectionFactory) Thread.currentThread().getContextClassLoader().loadClass(mcfClass)
-//                .getDeclaredConstructor().newInstance();
         }
         mcf = locator.createAndInitialize((Class<ManagedConnectionFactory>)mcfClass);
         setLogWriter(mcf);

diff --git a/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/jdbc/SQLTraceRecord.java b/nucleus/common/glassfish-api/src/main/java/org/glassfish/api/jdbc/SQLTraceRecord.java
@@ -314,10 +314,10 @@ public String toString() {
                         .append(param != null ? param.toString() : "null").append(" | ");
             }
         }
-        if (callingApplicationMethod != null) {
-            sb.append("CallingMethod=").append(callingApplicationMethod).append(" | ");
-        } else {
+        if (callingApplicationMethod == null) {
             sb.append("CallingMethod=(null)").append(" | ");
+        } else {
+            sb.append("CallingMethod=").append(callingApplicationMethod).append(" | ");
         }
         return sb.toString();
     }