Author: sebb
Date: Tue Apr 29 18:14:45 2008
New Revision: 652210
URL: http://svn.apache.org/viewvc?rev=652210&view=rev
Log:
Remove redundant null checks
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=652210&r1=652209&r2=652210&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Tue Apr 29 18:14:45 2008
@@ -204,7 +204,7 @@
chooser.setMultiSelectionEnabled(true);
chooser.showOpenDialog(GuiPackage.getInstance().getMainFrame());
File[] cfiles = chooser.getSelectedFiles();
- if (chooser != null && cfiles != null) {
+ if (cfiles != null) {
for (int idx=0; idx < cfiles.length; idx++) {
this.addFilename(cfiles[idx].getPath());
}
Modified:
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=652210&r1=652209&r2=652210&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Tue Apr 29 18:14:45 2008
@@ -234,7 +234,7 @@
res.setResponseCode("000"); // TODO
res.setResponseMessage(ex.toString());
} finally {
- if (ftp != null && ftp.isConnected()) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException ignored) {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=652210&r1=652209&r2=652210&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Tue Apr 29 18:14:45 2008
@@ -885,9 +885,7 @@
res = resultProcessing(areFollowingRedirect,
frameDepth, res);
log.debug("End : sample");
- if (httpMethod != null) {
- httpMethod.releaseConnection();
- }
+ httpMethod.releaseConnection();
return res;
} catch (IllegalArgumentException e)// e.g. some kinds of
invalid URL
{
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java?rev=652210&r1=652209&r2=652210&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
Tue Apr 29 18:14:45 2008
@@ -77,22 +77,16 @@
Object client = itr.next();
if (client instanceof ReceiveSubscriber) {
ReceiveSubscriber sub = (ReceiveSubscriber)
client;
- if (sub != null) {
- sub.close();
- sub = null;
- }
+ sub.close();
+ sub = null;
} else if (client instanceof Publisher) {
Publisher pub = (Publisher) client;
- if (pub != null) {
- pub.close();
- pub = null;
- }
+ pub.close();
+ pub = null;
} else if (client instanceof OnMessageSubscriber) {
OnMessageSubscriber sub = (OnMessageSubscriber)
client;
- if (sub != null) {
- sub.close();
- sub = null;
- }
+ sub.close();
+ sub = null;
}
}
clients.clear();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
