[mq-commits] [mq~mq5:16] MQ 5.0_B14 C-API respin.

  • From: jnakata@...
  • To: commits@...
  • Subject: [mq-commits] [mq~mq5:16] MQ 5.0_B14 C-API respin.
  • Date: Wed, 8 May 2013 20:19:17 +0000

Project:    mq
Repository: mq5
Revision:   16
Author:     jnakata
Date:       2013-05-08 20:18:59 UTC
Link:       

Log Message:
------------
MQ 5.0_B14 C-API respin.


Revisions:
----------
16


Modified Paths:
---------------
mq/src/share/cclient/client/MessageConsumer.cpp
mq/src/share/cclient/cshim/iMQSessionShim.cpp
mq/src/share/cclient/cshim/mqerrors.h
mq/src/share/cclient/cshim/mqsession.h
mq/src/share/cclient/error/ErrorCodes.cpp
mq/src/share/cclient/libmqcrt.spec


Diffs:
------
diff -r 324f0609a550 -r aae90353cf76 
mq/src/share/cclient/client/MessageConsumer.cpp
--- a/mq/src/share/cclient/client/MessageConsumer.cpp   Wed Apr 17 09:24:23 
2013 -0700
+++ b/mq/src/share/cclient/client/MessageConsumer.cpp   Wed May 08 13:18:59 
2013 -0700
@@ -105,14 +105,12 @@
     this->noLocal = PR_FALSE;
   } else {
     this->noLocal = noLocalArg;
+    CNDCHK( (this->isShared && this->noLocal == PR_TRUE), 
+            MQ_UNSUPPORTED_ARGUMENT_VALUE );
     CNDCHK( (this->isDurable && 
               this->noLocal == PR_TRUE && 
               this->session->getConnection()->getClientID() == NULL), 
             MQ_NOLOCAL_DURABLE_CONSUMER_NO_CLIENTID );
-    CNDCHK( (this->isShared && 
-              this->noLocal == PR_TRUE && 
-              this->session->getConnection()->getClientID() == NULL), 
-            MQ_NOLOCAL_SHARED_SUBSCRIPTION_NO_CLIENTID );
   }
 
   this->messageListener = messageListenerArg;

diff -r 324f0609a550 -r aae90353cf76 
mq/src/share/cclient/cshim/iMQSessionShim.cpp
--- a/mq/src/share/cclient/cshim/iMQSessionShim.cpp     Wed Apr 17 09:24:23 
2013 -0700
+++ b/mq/src/share/cclient/cshim/iMQSessionShim.cpp     Wed May 08 13:18:59 
2013 -0700
@@ -333,7 +333,6 @@
                         const MQDestinationHandle destinationHandle,
                         ConstMQString             subscriptionName,
                         ConstMQString             messageSelector,
-                        MQBool                    noLocal,
                         MQConsumerHandle *        consumerHandle)
 {
   static const char FUNCNAME[] = "MQCreateSharedMessageConsumer";
@@ -369,10 +368,10 @@
     UTF8String messageSelectorStr(messageSelector);
     CNDCHK( STRCMP( messageSelectorStr.toString(), messageSelector ) != 0, 
MQ_OUT_OF_MEMORY );
     ERRCHK( session->createConsumer(destination, PR_FALSE, PR_TRUE, 
&subscriptionNameStr,
-                                    &messageSelectorStr, noLocal, NULL, 
NULL, &consumer) );
+                                    &messageSelectorStr, PR_FALSE, NULL, 
NULL, &consumer) );
   } else {
     ERRCHK( session->createConsumer(destination, PR_FALSE, PR_TRUE, 
&subscriptionNameStr,
-                                    NULL, noLocal, NULL, NULL, &consumer) );
+                                    NULL, PR_FALSE, NULL, NULL, &consumer) );
   } 
   }
 
@@ -464,7 +463,6 @@
                              const MQDestinationHandle destinationHandle,
                              ConstMQString             subscriptionName,
                              ConstMQString             messageSelector,
-                             MQBool                    noLocal,
                              MQMessageListenerFunc     messageListener,
                              void *                    
messageListenerCallbackData,
                              MQConsumerHandle *        consumerHandle)
@@ -504,11 +502,11 @@
     UTF8String messageSelectorStr(messageSelector);
     CNDCHK( STRCMP( messageSelectorStr.toString(), messageSelector ) != 0, 
MQ_OUT_OF_MEMORY );
     ERRCHK( session->createConsumer(destination, PR_FALSE, PR_TRUE, 
&subscriptionNameStr,
-                                    &messageSelectorStr, noLocal, 
messageListener,
+                                    &messageSelectorStr, PR_FALSE, 
messageListener,
                                     messageListenerCallbackData, &consumer) 
);
   } else {
     ERRCHK( session->createConsumer(destination, PR_FALSE, PR_TRUE, 
&subscriptionNameStr,
-                                    NULL, noLocal, messageListener, 
+                                    NULL, PR_FALSE, messageListener, 
                                     messageListenerCallbackData, &consumer) 
);
   }
   }
@@ -605,7 +603,6 @@
                                const MQDestinationHandle destinationHandle,
                                ConstMQString             durableName,
                                ConstMQString             messageSelector,
-                               MQBool                    noLocal, 
                                MQConsumerHandle *        consumerHandle)
 {
   static const char FUNCNAME[] = "MQCreateSharedDurableMessageConsumer";
@@ -641,10 +638,10 @@
       UTF8String messageSelectorStr(messageSelector);
       CNDCHK( STRCMP( messageSelectorStr.toString(), messageSelector ) != 0, 
MQ_OUT_OF_MEMORY );
       ERRCHK( session->createConsumer(destination, PR_TRUE, PR_TRUE, 
&durableNameStr, 
-                                      &messageSelectorStr, noLocal, NULL, 
NULL, &consumer) );
+                                      &messageSelectorStr, PR_FALSE, NULL, 
NULL, &consumer) );
     } else {
       ERRCHK( session->createConsumer(destination, PR_TRUE, PR_TRUE, 
&durableNameStr, 
-                                      NULL, noLocal, NULL, NULL, &consumer) 
);
+                                      NULL, PR_FALSE, NULL, NULL, &consumer) 
);
     }
   }
 
@@ -750,7 +747,6 @@
                                     const MQDestinationHandle 
destinationHandle,
                                     ConstMQString             durableName,
                                     ConstMQString             
messageSelector,
-                                    MQBool                    noLocal,
                                     MQMessageListenerFunc     
messageListener,
                                     void *                    
messageListenerCallbackData,
                                     MQConsumerHandle *        consumerHandle)
@@ -789,11 +785,11 @@
       UTF8String messageSelectorStr(messageSelector);
       CNDCHK( STRCMP( messageSelectorStr.toString(), messageSelector ) != 0, 
MQ_OUT_OF_MEMORY );
       ERRCHK( session->createConsumer(destination, PR_TRUE, PR_TRUE, 
&durableNameStr,
-                                      &messageSelectorStr, noLocal, 
messageListener,
+                                      &messageSelectorStr, PR_FALSE, 
messageListener,
                                       messageListenerCallbackData, 
&consumer) );
     } else {
       ERRCHK( session->createConsumer(destination, PR_TRUE, PR_TRUE, 
&durableNameStr,
-                                      NULL, noLocal, messageListener,
+                                      NULL, PR_FALSE, messageListener,
                                       messageListenerCallbackData, 
&consumer) );
     }
   }

diff -r 324f0609a550 -r aae90353cf76 mq/src/share/cclient/cshim/mqerrors.h
--- a/mq/src/share/cclient/cshim/mqerrors.h     Wed Apr 17 09:24:23 2013 -0700
+++ b/mq/src/share/cclient/cshim/mqerrors.h     Wed May 08 13:18:59 2013 -0700
@@ -251,8 +251,7 @@
 #define MQ_DESTINATION_CONSUMER_LIMIT_EXCEEDED  
((MQError)(MQ_BASE_ERROR_CODE + 2109))
 #define MQ_CONSUMER_DESTINATION_NOT_FOUND       
((MQError)(MQ_BASE_ERROR_CODE + 2110))
 #define MQ_NOLOCAL_DURABLE_CONSUMER_NO_CLIENTID 
((MQError)(MQ_BASE_ERROR_CODE + 2111))
-#define MQ_NOLOCAL_SHARED_SUBSCRIPTION_NO_CLIENTID 
((MQError)(MQ_BASE_ERROR_CODE + 2112))
-#define MQ_CONSUMER_NO_SUBSCRIPTION_NAME        
((MQError)(MQ_BASE_ERROR_CODE + 2113))
+#define MQ_CONSUMER_NO_SUBSCRIPTION_NAME        
((MQError)(MQ_BASE_ERROR_CODE + 2112))
 
 #define MQ_CONNECTION_START_ERROR               
((MQError)(MQ_BASE_ERROR_CODE + 2200))
 #define MQ_CONNECTION_CREATE_SESSION_ERROR      
((MQError)(MQ_BASE_ERROR_CODE + 2201))

diff -r 324f0609a550 -r aae90353cf76 mq/src/share/cclient/cshim/mqsession.h
--- a/mq/src/share/cclient/cshim/mqsession.h    Wed Apr 17 09:24:23 2013 -0700
+++ b/mq/src/share/cclient/cshim/mqsession.h    Wed May 08 13:18:59 2013 -0700
@@ -168,9 +168,6 @@
  *        receives messages
  * @param subscriptionName the subscription name
  * @param messageSelector the message selector
- * @param noLocal if MQ_TRUE and the connection has client ID set, 
- *        the subscription should not receive messages sent by a
- *        producer on a connection with the same client ID
  * @param consumerHandle the output handle to the newly created
  *        consumer
  * @return the status of the function call.  Pass this value to
@@ -181,7 +178,6 @@
                         const MQDestinationHandle destinationHandle,
                         ConstMQString             subscriptionName,
                         ConstMQString             messageSelector,
-                        MQBool                    noLocal,
                         MQConsumerHandle *        consumerHandle);
 
 /**
@@ -220,9 +216,6 @@
  *        receives messages
  * @param durableName the subscription name
  * @param messageSelector the message selector
- * @param noLocal if MQ_TRUE and the connection has client ID set, 
- *        the subscription should not receive messages sent by a
- *        producer on a connection with the same client ID
  * @param consumerHandle the output handle to the newly created
  *        consumer
  * @return the status of the function call.  Pass this value to
@@ -233,7 +226,6 @@
                         const MQDestinationHandle destinationHandle,
                         ConstMQString             durableName,
                         ConstMQString             messageSelector,
-                        MQBool                    noLocal,
                         MQConsumerHandle *        consumerHandle);
 
 /**
@@ -278,9 +270,6 @@
  *        receives messages
  * @param subscriptionName the subscription name
  * @param messageSelector the messages selector
- * @param noLocal if MQ_TRUE and the connection has client ID set,
- *        the subscription should not receive  messages sent by 
- *        a producer on a connection that has the same client ID
  * @param messageListener the message listener callback function
  * @param listenerCallbackData void * data pointer that to be
  *        passed to the message listener function when it is called
@@ -294,7 +283,6 @@
                              const MQDestinationHandle destinationHandle,
                              ConstMQString             subscriptionName,
                              ConstMQString             messageSelector,
-                             MQBool                    noLocal,
                              MQMessageListenerFunc     messageListener,
                              void *                    listenerCallbackData,
                              MQConsumerHandle *        consumerHandle);
@@ -344,9 +332,6 @@
  *        receives messages
  * @param durableName the durable name
  * @param messageSelector the messages selector
- * @param noLocal if MQ_TRUE and the connection has client ID set,
- *        the consumer should not receive  messages sent by  a
- *        producer on a connection that has the same client ID
  * @param messageListener the message listener callback function
  * @param listenerCallbackData void * data pointer that to be
  *        passed to the message listener function when it is called
@@ -360,7 +345,6 @@
                              const MQDestinationHandle destinationHandle,
                              ConstMQString             durableName,
                              ConstMQString             messageSelector,
-                             MQBool                    noLocal,
                              MQMessageListenerFunc     messageListener,
                              void *                    listenerCallbackData,
                              MQConsumerHandle *        consumerHandle);

diff -r 324f0609a550 -r aae90353cf76 mq/src/share/cclient/error/ErrorCodes.cpp
--- a/mq/src/share/cclient/error/ErrorCodes.cpp Wed Apr 17 09:24:23 2013 -0700
+++ b/mq/src/share/cclient/error/ErrorCodes.cpp Wed May 08 13:18:59 2013 -0700
@@ -248,7 +248,6 @@
   case MQ_DESTINATION_CONSUMER_LIMIT_EXCEEDED:  return "The number of 
consumers on the destination exceeded limit";
   case MQ_CONSUMER_DESTINATION_NOT_FOUND:       return "Destination that 
this consumer was on no longer exists";
   case MQ_NOLOCAL_DURABLE_CONSUMER_NO_CLIENTID: return "Client ID must set 
when noLocal is true to create durable subscription";
-  case MQ_NOLOCAL_SHARED_SUBSCRIPTION_NO_CLIENTID: return "Client ID must 
set when noLocal is true to create shared subscription";
   case MQ_CONSUMER_NO_SUBSCRIPTION_NAME:        return "There is no 
subscription name specified";
 
 

diff -r 324f0609a550 -r aae90353cf76 mq/src/share/cclient/libmqcrt.spec
--- a/mq/src/share/cclient/libmqcrt.spec        Wed Apr 17 09:24:23 2013 -0700
+++ b/mq/src/share/cclient/libmqcrt.spec        Wed May 08 13:18:59 2013 -0700
@@ -192,7 +192,6 @@
                                                const MQDestinationHandle 
destinationHandle, \
                                                ConstMQString             
durableName, \
                                                ConstMQString             
messageSelector, \
-                                               MQBool                    
noLocal, \
                                                MQConsumerHandle *        
consumerHandle)
 include         "mqcrt.h"
 arch            all
@@ -218,7 +217,6 @@
                                         const MQDestinationHandle 
destinationHandle, \
                                         ConstMQString             
subscriptionName, \
                                         ConstMQString             
messageSelector, \
-                                        MQBool                    noLocal, \
                                         MQConsumerHandle *        
consumerHandle)
 include         "mqcrt.h"
 arch            all
@@ -247,7 +245,6 @@
                                                     const 
MQDestinationHandle destinationHandle, \
                                                     ConstMQString            
 durableName, \
                                                     ConstMQString            
 messageSelector, \
-                                                    MQBool                   
 noLocal, \
                                                     MQMessageListenerFunc    
 messageListener, \
                                                     void *                   
 listenerCallbackData, \
                                                     MQConsumerHandle *       
 consumerHandle)
@@ -276,7 +273,6 @@
                                              const MQDestinationHandle 
destinationHandle, \
                                              ConstMQString             
subscriptionName, \
                                              ConstMQString             
messageSelector, \
-                                             MQBool                    
noLocal, \
                                              MQMessageListenerFunc     
messageListener,\
                                              void *                    
listenerCallbackData, \
                                              MQConsumerHandle *        
consumerHandle)






[mq-commits] [mq~mq5:16] MQ 5.0_B14 C-API respin.

jnakata 05/08/2013
Terms of Use; Privacy Policy; Copyright ©2013-2015 (revision 20150226.965aeb8)
 
 
Close
loading
Please Confirm
Close