Better stream handing

objectscript · Oct 11, 2017 · 8d39086 · 8d39086
1 parent fc4e389
commit 8d39086
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/src/isc/rabbitmq/API.java b/src/isc/rabbitmq/API.java
@@ -4,7 +4,7 @@
 
 import java.io.IOException;
 
-
+import java.nio.file.*;
 /**
  * Created by eduard on 06.10.2017.
  */
@@ -30,26 +30,23 @@ public API(String host, int port, String user, String pass, String virtualHost,
         _queue = queue;
     }
 
-    public String[] readMessageStream(byte[] msg) throws Exception {
-        String[] result = new String[15];
-
-        GetResponse response = readMessage(result);
-        if (response == null) {
-            // No message retrieved.
-        } else {
-            System.arraycopy(response.getBody(),0,msg,0, response.getBody().length);
-        }
-        return result;
-    }
-
     public void sendMessage(byte[] msg) throws Exception {
         sendMessageToQueue(_queue, msg);
     }
 
     public void sendMessageToQueue(String queue, byte[] msg) throws Exception {
+        //log(msg);
         _channel.basicPublish("", queue, null, msg);
     }
 
+    public byte[] readMessageStream(String[] result) throws Exception {
+        GetResponse response = readMessage(result);
+        if (response == null) {
+            return new byte[0];
+        }
+        return response.getBody();
+    }
+
     public String[] readMessageString() throws Exception {
         String[] result = new String[16];
 
@@ -70,6 +67,7 @@ private GetResponse readMessage(String[] msg) throws IOException {
         GetResponse response = _channel.basicGet(_queue, autoAck);
         if (response == null) {
             // No message retrieved.
+            response = new GetResponse(null, null, new byte[0], 0);
         } else {
             AMQP.BasicProperties props = response.getProps();
             msg[0] =  Integer.toString(response.getBody().length);
@@ -87,11 +85,18 @@ 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();