svn commit: r1815759 - /jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java

[pmouawad]

Author: pmouawad
Date: Sun Nov 19 21:06:24 2017
New Revision: 1815759

URL: http://svn.apache.org/viewvc?rev=1815759&view=rev
Log:
Bug 61544 - JMS Point-to-Point Sampler: Enhance communication styles with read, 
browse, clear
Fix SONAR errors
Bugzilla Id: 61544

Modified:
    
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java

Modified: 
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1815759&r1=1815758&r2=1815759&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
 (original)
+++ 
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
 Sun Nov 19 21:06:24 2017
@@ -323,7 +323,9 @@ public class JMSSampler extends Abstract
         String retVal = null;
         QueueReceiver consumer = null;
         Message reply = null;
+        String queueName = null;
         try {
+            queueName = queue.getQueueName();
             consumer = session.createReceiver(queue, jmsSelector);
             reply = consumer.receive(Long.valueOf(getTimeout()));
             LOGGER.debug("Message: {}", reply);
@@ -337,7 +339,9 @@ public class JMSSampler extends Abstract
                 res.setResponseMessage("No message received");
             }
         } catch (Exception ex) {
-            LOGGER.error("Error browsing queue with selector {}", jmsSelector, 
ex);
+            res.setResponseMessage("Error browsing queue "+queueName+" with 
selector "
+                    + jmsSelector+ ", message:"+ex.getMessage());
+            LOGGER.error("Error browsing queue {} with selector {}", 
queueName, jmsSelector, ex);
         } finally {
             Utils.close(consumer, LOGGER);
         }
@@ -376,13 +380,16 @@ public class JMSSampler extends Abstract
                 }
                 Utils.messageProperties(propBuffer, msg);
             } catch (JMSException e) {
-                LOGGER.error(e.getMessage());
+                buffer.append("Error extracting content from 
message:"+e.getMessage());
+                LOGGER.error("Error extracting content from message", e);
             }
         }
     }
 
     private String browseQueueDetails(Queue queue, SampleResult res) {
+        String queueName = null;
         try {
+            queueName = queue.getQueueName();
             StringBuilder messageBodies = new StringBuilder(150);
             messageBodies.append("==== Browsing Messages ===\n");
             // get some queue details
@@ -417,7 +424,7 @@ public class JMSSampler extends Abstract
             return (messageBodies + queue.getQueueName() + " has " + numMsgs + 
" messages");
         } catch (Exception e) {
             res.setResponseMessage("Error counting message on the queue");
-            LOGGER.error("Error browsing messages on the queue, message {}", 
e.getMessage());
+            LOGGER.error("Error browsing messages on the queue {}", queueName, 
e);
             return "Error browsing messages on the queue, message "+ 
e.getMessage();
         }
     }
@@ -425,7 +432,9 @@ public class JMSSampler extends Abstract
     private String clearQueue(Queue queue, SampleResult res) {
         String retVal = null;
         QueueReceiver consumer = null;
+        String queueName = null;
         try {
+            queueName = queue.getQueueName();
             consumer = session.createReceiver(queue);
             Message deletedMsg = null;
             long deletedMsgCount = 0;
@@ -440,9 +449,9 @@ public class JMSSampler extends Abstract
                     getTimeoutAsInt()+"ms";
             res.setResponseMessage(retVal);
         } catch (Exception ex) {
-            res.setResponseMessage("Error clearing queue");
-            LOGGER.error("Error clearing queue, message {}", ex.getMessage());
-            return "Error clearing queue, message" + ex.getMessage();
+            res.setResponseMessage("Error clearing queue:"+queueName);
+            LOGGER.error("Error clearing queue {}", queueName, ex);
+            return "Error clearing queue "+queueName+", message:" 
+ex.getMessage();
         } finally {
             Utils.close(consumer, LOGGER);
         }