From 3ebd31953292505008511d788202413c4af9dad8 Mon Sep 17 00:00:00 2001 From: Ondro Mihalyi Date: Mon, 19 Aug 2024 16:30:18 +0200 Subject: [PATCH] SQLTraceListener: Cleanup code base on review --- .../enterprise/connectors/ActiveResourceAdapterImpl.java | 6 +----- .../main/java/org/glassfish/api/jdbc/SQLTraceRecord.java | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java index 1d18cedaaa4..b7454dd14e8 100755 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/ActiveResourceAdapterImpl.java +++ b/appserver/connectors/connectors-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)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 index fd39c675e2c..3c8d6f30d55 100644 --- 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(); }