From b2158980e8f3af26e2c49a6d191f86d3ca19fcc9 Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Thu, 7 Jun 2018 16:42:31 -0700
Subject: [PATCH] Fix | Moving RequestBoundaryMethodsTest.java to connection
 package

---
 .../com/microsoft/sqlserver/jdbc/SQLServerConnection.java   | 6 +++---
 .../RequestBoundaryMethodsTest.java                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/test/java/com/microsoft/sqlserver/jdbc/{requestboundary => connection}/RequestBoundaryMethodsTest.java (97%)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
index d2f2ef3b8..918d58ee4 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -5323,9 +5323,9 @@ public <T> T unwrap(Class<T> iface) throws SQLException {
     private boolean originalDisableStatementPooling;
     private int originalServerPreparedStatementDiscardThreshold;
     private Boolean originalEnablePrepareOnFirstPreparedStatementCall;
-    private String originalSCatalog = null;
-    private volatile SQLWarning originalSqlWarnings = null;
-    private List<Statement> openStatements = null;
+    private String originalSCatalog;
+    private volatile SQLWarning originalSqlWarnings;
+    private List<Statement> openStatements;
 
     protected void beginRequestInternal() throws SQLException {
         synchronized (this) {
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/requestboundary/RequestBoundaryMethodsTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java
similarity index 97%
rename from src/test/java/com/microsoft/sqlserver/jdbc/requestboundary/RequestBoundaryMethodsTest.java
rename to src/test/java/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java
index 6ead1bb94..e646f63ed 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/requestboundary/RequestBoundaryMethodsTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java
@@ -1,4 +1,4 @@
-package com.microsoft.sqlserver.jdbc.requestboundary;
+package com.microsoft.sqlserver.jdbc.connection;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;