[hornetq-commits] JBoss hornetq SVN: r8925 - trunk/src/main/org/hornetq/ra/inflow.

Author: jmesnil Date: 2010-03-11 11:16:48 -0500 (Thu, 11 Mar 2010) New Revision: 8925 Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java Log: RA activation * display clientID in HornetQActivationSpec.toString() * display subscriptionName when throwing a InvalidClientException from HornetQMessageHandler.setup() Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2010-03-11 12:21:27 UTC (rev 8924) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2010-03-11 16:16:48 UTC (rev 8925) @@ -699,6 +699,7 @@ } buffer.append(" ack=").append(getAcknowledgeMode()); buffer.append(" durable=").append(subscriptionDurability); + buffer.append(" clientID=").append(getClientID()); if (subscriptionName != null) { buffer.append(" subscription=").append(subscriptionName); Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-11 12:21:27 UTC (rev 8924) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-03-11 16:16:48 UTC (rev 8925) @@ -91,17 +91,15 @@ if (activation.isTopic() && spec.isSubscriptionDurable()) { String subscriptionName = spec.getSubscriptionName(); - + String clientID = spec.getClientID(); + // Durable sub - - if (activation.getActivationSpec().getClientID() == null) + if (clientID == null) { - throw new InvalidClientIDException("Cannot create durable subscription - client ID has not been set"); + throw new InvalidClientIDException("Cannot create durable subscription for " + subscriptionName + " - client ID has not been set"); } - SimpleString queueName = new SimpleString(HornetQDestination.createQueueNameForDurableSubscription(activation.getActivationSpec() - .getClientID(), - subscriptionName)); + SimpleString queueName = new SimpleString(HornetQDestination.createQueueNameForDurableSubscription(clientID, subscriptionName)); QueueQuery subResponse = session.queueQuery(queueName);