Issue 21536: Avoid NPE in SQLTraceRecord (#21980)

h2002044 · yaminikb · commit 5c41041d4064 · 2017-07-05T10:05:13.000+05:30
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
@@ -228,7 +228,9 @@ public String toString() {
         if(params != null && params.length > 0) {
             int index = 0;
             for(Object param : params) {
-                sb.append("arg[" + index++ + "]=" + param.toString() + " | ");
+                sb.append("arg[" + index++ + "]=" +
+                    (param != null ? param.toString() : "null" ) +
+                    " | ");
             }
         }
         //TODO add poolNames and other fields of this record.

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,9 @@ public String toString() {`
`228`	`228`	`if(params != null && params.length > 0) {`
`229`	`229`	`int index = 0;`
`230`	`230`	`for(Object param : params) {`
`231`		`- sb.append("arg[" + index++ + "]=" + param.toString() + " \| ");`
	`231`	`+ sb.append("arg[" + index++ + "]=" +`
	`232`	`+ (param != null ? param.toString() : "null" ) +`
	`233`	`+ " \| ");`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`//TODO add poolNames and other fields of this record.`