diff --git a/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java b/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java index 0aea1a0f6b..5723bf8345 100644 --- a/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java +++ b/connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/Util.java @@ -50,6 +50,10 @@ public static String addSingleQuotes(String text) { private static String timeZone; + public static void resetTimeZone() { + timeZone = null; + } + public static String getDefaultTimeZoneString() { if (timeZone == null) { String s = new SimpleDateFormat("Z").format(new Date(0)); //$NON-NLS-1$ diff --git a/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestSingleInsert.java b/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestSingleInsert.java index 6e666e211f..0556813e5c 100644 --- a/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestSingleInsert.java +++ b/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestSingleInsert.java @@ -52,20 +52,17 @@ import org.teiid.translator.ExecutionContext; import org.teiid.translator.salesforce.SalesForceExecutionFactory; import org.teiid.translator.salesforce.SalesforceConnection; -import org.teiid.translator.salesforce.Util; @SuppressWarnings("nls") public class TestSingleInsert { @BeforeClass public static void oneTimeSetup() { - Util.resetTimeZone(); TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-1")); } @AfterClass public static void oneTimeTeardown() { - Util.resetTimeZone(); TimestampWithTimezone.resetCalendar(null); } diff --git a/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java b/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java index 7cba3ca890..f829c72e01 100644 --- a/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java +++ b/connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java @@ -62,7 +62,6 @@ import org.teiid.translator.salesforce.SalesForceExecutionFactory; import org.teiid.translator.salesforce.SalesForceMetadataProcessor; import org.teiid.translator.salesforce.SalesforceConnection; -import org.teiid.translator.salesforce.Util; import org.teiid.translator.salesforce.execution.QueryExecutionImpl; import com.sforce.soap.partner.QueryResult; @@ -251,12 +250,10 @@ public static QueryMetadataInterface exampleSalesforce() { } @BeforeClass static public void oneTimeSetup() { - Util.resetTimeZone(); TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); } @AfterClass static public void oneTimeTearDown() { - Util.resetTimeZone(); TimeZone.setDefault(null); }