Added information to error message

rene-ye · rene-ye · commit 25301e6fa042 · 2018-02-08T11:17:38.000-08:00
To debug a random mismatch error which can't be reproduced locally.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -3428,19 +3428,24 @@ final boolean doExecute() throws SQLServerException {
             }
         }
         finally {
-            if (integratedSecurity) {
-                if (null != authentication)
-                    authentication.ReleaseClientContext();
-                authentication = null;
-                
+            if (integratedSecurity) {                
                 if (null != ImpersonatedUserCred) {
                     try {
-                        ImpersonatedUserCred.dispose();
+                    	if (ImpersonatedUserCred.getRemainingLifetime() <= 0) {
+                            if (null != authentication)
+                                authentication.ReleaseClientContext();
+                            authentication = null;
+                    		ImpersonatedUserCred.dispose();
+                    	}
                     }
                     catch (GSSException e) {
                         if (connectionlogger.isLoggable(Level.FINER))
                             connectionlogger.finer(toString() + " Release of the credentials failed GSSException: " + e);
                     }
+                } else {
+                    if (null != authentication)
+                        authentication.ReleaseClientContext();
+                    authentication = null;
                 }
             }
         }
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java b/src/test/java/com/microsoft/sqlserver/testframework/util/ComparisonUtil.java
@@ -92,16 +92,16 @@ public static void compareExpectedAndActual(int dataType,
         else
             switch (dataType) {
                 case java.sql.Types.BIGINT:
-                    assertTrue((((Long) expectedValue).longValue() == ((Long) actualValue).longValue()), "Unexpected bigint value");
+                    assertTrue((((Long) expectedValue).longValue() == ((Long) actualValue).longValue()), "Unexpected bigint value. Expected:" + ((Long) expectedValue).longValue() + " Actual:" + ((Long) actualValue).longValue());
                     break;
 
                 case java.sql.Types.INTEGER:
-                    assertTrue((((Integer) expectedValue).intValue() == ((Integer) actualValue).intValue()), "Unexpected int value");
+                    assertTrue((((Integer) expectedValue).intValue() == ((Integer) actualValue).intValue()), "Unexpected int value. Expected:" + ((Integer) expectedValue).intValue() + " Actual:" + ((Integer) actualValue).intValue());
                     break;
 
                 case java.sql.Types.SMALLINT:
                 case java.sql.Types.TINYINT:
-                    assertTrue((((Short) expectedValue).shortValue() == ((Short) actualValue).shortValue()), "Unexpected smallint/tinyint value");
+                    assertTrue((((Short) expectedValue).shortValue() == ((Short) actualValue).shortValue()), "Unexpected smallint/tinyint value. Expected:" + ((Short) expectedValue).shortValue() + " Actual:" + ((Short) actualValue).shortValue());
                     break;
 
                 case java.sql.Types.BIT:
@@ -115,11 +115,11 @@ public static void compareExpectedAndActual(int dataType,
                     break;
 
                 case java.sql.Types.DOUBLE:
-                    assertTrue((((Double) expectedValue).doubleValue() == ((Double) actualValue).doubleValue()), "Unexpected float value");
+                    assertTrue((((Double) expectedValue).doubleValue() == ((Double) actualValue).doubleValue()), "Unexpected double value. Expected:" + ((Double) expectedValue).doubleValue() + " Actual:" + ((Double) actualValue).doubleValue());
                     break;
 
                 case java.sql.Types.REAL:
-                    assertTrue((((Float) expectedValue).floatValue() == ((Float) actualValue).floatValue()), "Unexpected real value");
+                    assertTrue((((Float) expectedValue).floatValue() == ((Float) actualValue).floatValue()), "Unexpected real/float value. Expected:" + ((Float) expectedValue).floatValue() + " Actual:" + ((Float) actualValue).floatValue());
                     break;
 
                 case java.sql.Types.VARCHAR:

Original file line number	Diff line number	Diff line change
`@@ -3428,19 +3428,24 @@ final boolean doExecute() throws SQLServerException {`
`3428`	`3428`	`}`
`3429`	`3429`	`}`
`3430`	`3430`	`finally {`
`3431`		`- if (integratedSecurity) {`
`3432`		`- if (null != authentication)`
`3433`		`- authentication.ReleaseClientContext();`
`3434`		`- authentication = null;`
`3435`		`-`
	`3431`	`+ if (integratedSecurity) {`
`3436`	`3432`	`if (null != ImpersonatedUserCred) {`
`3437`	`3433`	`try {`
`3438`		`- ImpersonatedUserCred.dispose();`
	`3434`	`+ if (ImpersonatedUserCred.getRemainingLifetime() <= 0) {`
	`3435`	`+ if (null != authentication)`
	`3436`	`+ authentication.ReleaseClientContext();`
	`3437`	`+ authentication = null;`
	`3438`	`+ ImpersonatedUserCred.dispose();`
	`3439`	`+ }`
`3439`	`3440`	`}`
`3440`	`3441`	`catch (GSSException e) {`
`3441`	`3442`	`if (connectionlogger.isLoggable(Level.FINER))`
`3442`	`3443`	`connectionlogger.finer(toString() + " Release of the credentials failed GSSException: " + e);`
`3443`	`3444`	`}`
	`3445`	`+ } else {`
	`3446`	`+ if (null != authentication)`
	`3447`	`+ authentication.ReleaseClientContext();`
	`3448`	`+ authentication = null;`
`3444`	`3449`	`}`
`3445`	`3450`	`}`
`3446`	`3451`	`}`