Fix for UTF8 Windows errors

objectscript · Feb 2, 2018 · 97bb62e · 97bb62e
1 parent 08661f8
commit 97bb62e
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/isc/rabbitmq/API.java b/src/isc/rabbitmq/API.java
@@ -4,8 +4,7 @@
 
 import java.io.IOException;
 
-import java.nio.file.*;
-
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.HashMap;
 
@@ -65,7 +64,6 @@ public void sendMessage(byte[] msg) throws Exception {
     }
 
     public void sendMessageToQueue(String queue, byte[] msg) throws Exception {
-        //log(msg);
         _channel.basicPublish("", queue, null, msg);
     }
 
@@ -89,7 +87,19 @@ public String[] readMessageString() throws Exception {
         if (response == null) {
             // No message retrieved.
         } else {
-            result[15] = new String(response.getBody());
+            result[15] = new String(response.getBody(), StandardCharsets.UTF_8);
+        }
+        return result;
+    }
+
+    public String readMessageBodyString() throws Exception {
+        String result;
+        boolean autoAck = true;
+        GetResponse response = _channel.basicGet(_queue, autoAck);
+        if (response == null) {
+            result = "";
+        } else {
+            result = new String(response.getBody(), StandardCharsets.UTF_8);
         }
         return result;
     }
@@ -120,18 +130,11 @@ private GetResponse readMessage(String[] msg) throws IOException {
             msg[12] = props.getDeliveryMode() != null ? Integer.toString(props.getDeliveryMode()) : null;
             msg[13] = props.getPriority() != null ? Integer.toString(props.getPriority()) : null;
             msg[14] = props.getTimestamp() != null ? props.getTimestamp().toString() : null;
-
-            //log(response.getBody());
         }
         return response;
 
     }
 
-    private void log(byte[] msg) throws IOException {
-        Path path = Paths.get("C:\\InterSystems\\java.log");
-        Files.write(path, msg);
-    }
-
     public void close()throws Exception {
         _channel.close();
         _connection.close();