svn commit: r938057 - /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java

[sebb]

Author: sebb
Date: Mon Apr 26 14:26:57 2010
New Revision: 938057

URL: http://svn.apache.org/viewvc?rev=938057&view=rev
Log:
Fix possible NPE

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

Modified: 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java?rev=938057&r1=938056&r2=938057&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
 Mon Apr 26 14:26:57 2010
@@ -81,10 +81,10 @@ public class MessageAdmin {
         if (log.isDebugEnabled()) {
             log.debug("GET_ID [" + id + "] for " + holder);
         }
-        if (!holder.hasReply()) {
-            log.info("Message with " + id + " not found.");
+        if (holder == null || !holder.hasReply()) {
+            log.debug("Message with " + id + " not found.");
         }
-        return (Message) holder.getReply();
+        return holder==null ? null : (Message) holder.getReply();
     }
 }