[openamq-dev] Patch for AMQ-547 against OpenAMQ 1.2c1 source kit

[Martin Lucina]

Martin,

attached is a patch for the crash discussed here
(http://wiki.openamq.org/forum/t-6752/amq-server-segfault#post-15436).

Apply to the source kit by changing to the top-level directory
(OpenAMQ-1.2c1/) and doing:

patch -p1 < PATH/TO/amq-547.full.patch

Can you put these instructions and the patch in the forum thread?

Thanks,

-mato
-------------- next part --------------
diff -ur OpenAMQ-1.2c1.orig/OpenAMQ-1.2c1/server/amq_queue.c OpenAMQ-1.2c1/OpenAMQ-1.2c1/server/amq_queue.c
--- OpenAMQ-1.2c1.orig/OpenAMQ-1.2c1/server/amq_queue.c	2007-03-29 14:21:41.954898150 +0200
+++ OpenAMQ-1.2c1/OpenAMQ-1.2c1/server/amq_queue.c	2007-03-29 14:23:24.376540964 +0200
@@ -1257,9 +1257,9 @@
 //
 //  JAMQ-55
 rc = amq_queue_basic_message_count (self->queue_basic) +
-     self->connection ? 
+     (self->connection ? 
      smt_thread_reply_backlog (self->connection->thread) :
-     0;
+     0);
 }
 else
     rc = -1;                        //  Return error on zombie object.
 
diff -ur OpenAMQ-1.2c1.orig/OpenAMQ-1.2c1/server/amq_queue.icl OpenAMQ-1.2c1/OpenAMQ-1.2c1/server/amq_queue.icl
--- OpenAMQ-1.2c1.orig/OpenAMQ-1.2c1/server/amq_queue.icl	2007-03-29 14:21:41.851920601 +0200
+++ OpenAMQ-1.2c1/OpenAMQ-1.2c1/server/amq_queue.icl	2007-03-29 14:22:35.139303141 +0200
@@ -556,9 +556,9 @@
     //
     //  JAMQ-55
     rc = amq_queue_basic_message_count (self->queue_basic) +
-         self->connection ? 
+         (self->connection ? 
          smt_thread_reply_backlog (self->connection->thread) :
-         0;
+         0);
 </method>