Attachment #33645 for bug #59083

View | Details | Raw Unified | Return to bug 59083
Collapse All | Expand All




                httpMethod = new TraceMethod(urlStr);
            } else if (method.equals(HTTPConstants.OPTIONS)){
                httpMethod = new OptionsMethod(urlStr);
            } else if (HttpWebdav.isWebdavMethod(method)) {
                httpMethod = new WebdavMethod(urlStr, method);
                    @Override
                    public String getName() { // HC3.1 does not have the method
                        return HTTPConstants.DELETE;
                    }
                };
            } else if (method.equals(HTTPConstants.PATCH)){
                httpMethod = new EntityEnclosingMethod(urlStr) {
                    @Override
                    public String getName() { // HC3.1 does not have the method
                        return HTTPConstants.PATCH;
                    }
                };
            } else {
                throw new IllegalArgumentException("Unexpected method: '"+method+"'");
            }

        return client != null;
    }

    private static class WebdavMethod extends EntityEnclosingMethod {
        private final String method;

        public WebdavMethod(String urlstr, String method) {
            super(urlstr);
            this.method = method;
        }

        @Override
        public String getName() {
            return this.method;
        }
    }

}

Return to bug 59083

Lines 224-243 public class HTTPHC3Impl extends HTTPHCAbstractImpl { Link Here

(-)a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (-14 / +16 lines)
224	httpMethod = new TraceMethod(urlStr);	224	httpMethod = new TraceMethod(urlStr);
225	} else if (method.equals(HTTPConstants.OPTIONS)){	225	} else if (method.equals(HTTPConstants.OPTIONS)){
226	httpMethod = new OptionsMethod(urlStr);	226	httpMethod = new OptionsMethod(urlStr);
227	} else if (method.equals(HTTPConstants.DELETE)){	227	} else if (HttpWebdav.isWebdavMethod(method)) {
228	httpMethod = new EntityEnclosingMethod(urlStr) {	228	httpMethod = new WebdavMethod(urlStr, method);
229	@Override
230	public String getName() { // HC3.1 does not have the method
231	return HTTPConstants.DELETE;
232	}
233	};
234	} else if (method.equals(HTTPConstants.PATCH)){
235	httpMethod = new EntityEnclosingMethod(urlStr) {
236	@Override
237	public String getName() { // HC3.1 does not have the method
238	return HTTPConstants.PATCH;
239	}
240	};
241	} else {	229	} else {
242	throw new IllegalArgumentException("Unexpected method: '"+method+"'");	230	throw new IllegalArgumentException("Unexpected method: '"+method+"'");
243	}	231	}
Lines 1147-1150 public class HTTPHC3Impl extends HTTPHCAbstractImpl { Link Here
1147	return client != null;	1135	return client != null;
1148	}	1136	}
1149		1137
		1138	private static class WebdavMethod extends EntityEnclosingMethod {
		1139	private final String method;
		1140
		1141	public WebdavMethod(String urlstr, String method) {
		1142	super(urlstr);
		1143	this.method = method;
		1144	}
		1145
		1146	@Override
		1147	public String getName() {
		1148	return this.method;
		1149	}
		1150	}
		1151
1150	}	1152	}