Author: sebb
Date: Tue Apr  6 02:06:16 2010
New Revision: 930998

URL: http://svn.apache.org/viewvc?rev=930998&view=rev
Log:
Basic check to ensure that Publisher failures are better reported in test 
results

Modified:
    
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
    
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java

Modified: 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=930998&r1=930997&r2=930998&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
 Tue Apr  6 02:06:16 2010
@@ -45,6 +45,8 @@ public class Publisher {
 
     private TopicPublisher publisher = null;
 
+    public final boolean isValid;
+    
     /**
      * Create a publisher using either the jndi.properties file or the 
provided parameters
      * @param useProps true if a jndi.properties file is to be used
@@ -56,6 +58,8 @@ public class Publisher {
      * @param securityPrincipal (ignored if useProps is true)
      * @param securityCredentials (ignored if useProps is true)
      */
+    // TODO - does it make sense to return a Publisher that has not been 
created successfully?
+    // Might be simpler just to return JMSException
     public Publisher(boolean useProps, String initialContextFactory, String 
providerUrl, 
             String connfactory, String topic, boolean useAuth,
             String securityPrincipal, String securityCredentials) {
@@ -67,6 +71,7 @@ public class Publisher {
         } else {
             log.error("Could not initialize JNDI Initial Context Factory");
         }
+        isValid = publisher != null; // This is the last item set up by 
initConnection
     }
 
     private Context initJNDI(boolean useProps, String initialContextFactory, 

Modified: 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=930998&r1=930997&r2=930998&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
 Tue Apr  6 02:06:16 2010
@@ -128,12 +128,15 @@ public class PublisherSampler extends Ba
     public SampleResult sample() {
         SampleResult result = new SampleResult();
         result.setSampleLabel(getName());
+        result.setSuccessful(false); // Assume it will fail
+        result.setResponseCode("000"); // ditto $NON-NLS-1$
+        result.setResponseMessage("See log file for details"); // ditto
         if (publisher == null) {
             initClient();
         }
         StringBuilder buffer = new StringBuilder();
         int loop = getIterationCount();
-        if (publisher != null) {
+        if (publisher != null && publisher.isValid) {
             result.sampleStart();
             for (int idx = 0; idx < loop; idx++) {
                 String tmsg = getMessageContent();



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org

Reply via email to