[asterixdb] 02/02: Merge commit 'ee67a43' from 'stabilization-f69489' into 'master'

[mblow]

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 013b4a431774b3b97275ad308dd3100dd1ab480e
Merge: d8da7b7 ee67a43
Author: Michael Blow <mb...@apache.org>
AuthorDate: Sun Feb 17 09:46:32 2019 -0500

    Merge commit 'ee67a43' from 'stabilization-f69489' into 'master'
    
    Change-Id: I2895436bd8a0de9a467409895f5363a7e8109b80

 .../src/test/java/org/apache/asterix/test/common/TestExecutor.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --cc 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index f621d34,4129b5a..4e4b760
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@@ -187,8 -181,6 +187,10 @@@ public class TestExecutor 
  
      public TestExecutor(List<InetSocketAddress> endpoints) {
          this.endpoints = endpoints;
-         this.allCharsets = Charset.availableCharsets().values().stream()
-                 .filter(c -> canEncodeDecode(c, 
"\n\t\\[]{}'\"")).collect(Collectors.toList());
++        this.allCharsets = Stream
++                .of("UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE", "UTF-32", 
"UTF-32BE", "UTF-32LE", "x-UTF-32BE-BOM",
++                        "x-UTF-32LE-BOM", "x-UTF-16LE-BOM")
++                
.filter(Charset::isSupported).map(Charset::forName).collect(Collectors.toList());
      }
  
      public void setLibrarian(IExternalUDFLibrarian librarian) {