You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/11/25 02:27:46 UTC

svn commit: r1038886 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java

Author: sebb
Date: Thu Nov 25 01:27:45 2010
New Revision: 1038886

URL: http://svn.apache.org/viewvc?rev=1038886&view=rev
Log:
Allow for null URL in HttpSampleResult

Modified:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java?rev=1038886&r1=1038885&r2=1038886&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java Thu Nov 25 01:27:45 2010
@@ -156,44 +156,46 @@ public class RequestViewHTTP implements 
 
         if (objectResult instanceof HTTPSampleResult) {
             HTTPSampleResult sampleResult = (HTTPSampleResult) objectResult;
-            URL hUrl = sampleResult.getURL();
 
             // Display with same order HTTP protocol
             requestModel.addRow(new RowResult(
                     JMeterUtils.getResString("view_results_table_request_http_method"), //$NON-NLS-1$
                     sampleResult.getHTTPMethod()));
-            requestModel.addRow(new RowResult(JMeterUtils
-                    .getResString("view_results_table_request_http_protocol"), //$NON-NLS-1$
-                    hUrl.getProtocol()));
-            requestModel.addRow(new RowResult(
-                    JMeterUtils.getResString("view_results_table_request_http_host"), //$NON-NLS-1$
-                    hUrl.getHost()));
-            int port = hUrl.getPort() == -1 ? hUrl.getDefaultPort() : hUrl.getPort();
-            requestModel.addRow(new RowResult(
-                    JMeterUtils.getResString("view_results_table_request_http_port"), //$NON-NLS-1$
-                    Integer.valueOf(port)));
-            requestModel.addRow(new RowResult(
-                    JMeterUtils.getResString("view_results_table_request_http_path"), //$NON-NLS-1$
-                    hUrl.getPath()));
 
-            String queryGet = hUrl.getQuery() == null ? "" : hUrl.getQuery(); //$NON-NLS-1$
-            // Concatenate query post if exists
-            String queryPost = sampleResult.getQueryString();
-            if (queryPost != null && queryPost.length() > 0) {
-                if (queryGet.length() > 0) {
-                    queryGet += PARAM_CONCATENATE; 
+            URL hUrl = sampleResult.getURL();
+            if (hUrl != null){ // can be null - e.g. if URL was invalid
+                requestModel.addRow(new RowResult(JMeterUtils
+                        .getResString("view_results_table_request_http_protocol"), //$NON-NLS-1$
+                        hUrl.getProtocol()));
+                requestModel.addRow(new RowResult(
+                        JMeterUtils.getResString("view_results_table_request_http_host"), //$NON-NLS-1$
+                        hUrl.getHost()));
+                int port = hUrl.getPort() == -1 ? hUrl.getDefaultPort() : hUrl.getPort();
+                requestModel.addRow(new RowResult(
+                        JMeterUtils.getResString("view_results_table_request_http_port"), //$NON-NLS-1$
+                        Integer.valueOf(port)));
+                requestModel.addRow(new RowResult(
+                        JMeterUtils.getResString("view_results_table_request_http_path"), //$NON-NLS-1$
+                        hUrl.getPath()));
+    
+                String queryGet = hUrl.getQuery() == null ? "" : hUrl.getQuery(); //$NON-NLS-1$
+                // Concatenate query post if exists
+                String queryPost = sampleResult.getQueryString();
+                if (queryPost != null && queryPost.length() > 0) {
+                    if (queryGet.length() > 0) {
+                        queryGet += PARAM_CONCATENATE; 
+                    }
+                    queryGet += queryPost;
                 }
-                queryGet += queryPost;
-            }
-            queryGet = RequestViewHTTP.decodeQuery(queryGet);
-            if (queryGet != null) {
-                Map<String, String> mapQuery = RequestViewHTTP.getQueryMap(queryGet);
-                Set<String> keys = mapQuery.keySet();
-                for (String key : keys) {
-                    paramsModel.addRow(new RowResult(key, mapQuery.get(key)));
+                queryGet = RequestViewHTTP.decodeQuery(queryGet);
+                if (queryGet != null) {
+                    Map<String, String> mapQuery = RequestViewHTTP.getQueryMap(queryGet);
+                    Set<String> keys = mapQuery.keySet();
+                    for (String key : keys) {
+                        paramsModel.addRow(new RowResult(key, mapQuery.get(key)));
+                    }
                 }
             }
-
             // Display cookie in headers table (same location on http protocol)
             String cookie = sampleResult.getCookies();
             if (cookie != null && cookie.length() > 0) {



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org