You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/01/03 20:12:11 UTC
svn commit: r1226923 - in /jmeter/trunk/src:
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/samplers/
core/org/apache/jmeter/testbeans/gui/ core/org/apache/jmeter/util/
jorphan/org/apache/jorphan/reflect/ jorphan/org/apache/jorphan/ut...
Author: sebb
Date: Tue Jan 3 19:12:10 2012
New Revision: 1226923
URL: http://svn.apache.org/viewvc?rev=1226923&view=rev
Log:
Create arrays with the correct size [Findbugs]
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java Tue Jan 3 19:12:10 2012
@@ -170,7 +170,7 @@ public class DistributionGraph extends J
long total = p_model.getCount();
Collection<Number[]> values = p_model.getDistribution().values();
- Number[][] objval = values.toArray(new Number[][]{});
+ Number[][] objval = values.toArray(new Number[values.size()][]);
// we sort the objects
Arrays.sort(objval, new NumberComparator());
int len = objval.length;
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Tue Jan 3 19:12:10 2012
@@ -537,7 +537,7 @@ public class SampleResult implements Ser
if (assertionResults == null) {
return EMPTY_AR;
}
- return assertionResults.toArray(new AssertionResult[0]);
+ return assertionResults.toArray(new AssertionResult[assertionResults.size()]);
}
/**
@@ -598,7 +598,7 @@ public class SampleResult implements Ser
if (subResults == null) {
return EMPTY_SR;
}
- return subResults.toArray(new SampleResult[0]);
+ return subResults.toArray(new SampleResult[subResults.size()]);
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Tue Jan 3 19:12:10 2012
@@ -135,7 +135,7 @@ public class TestBeanGUI extends Abstrac
if (s != null) {
paths.addAll(Arrays.asList(JOrphanUtils.split(s, ",", "")));// $NON-NLS-1$ // $NON-NLS-2$
}
- PropertyEditorManager.setEditorSearchPath(paths.toArray(new String[0]));
+ PropertyEditorManager.setEditorSearchPath(paths.toArray(new String[paths.size()]));
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Tue Jan 3 19:12:10 2012
@@ -648,7 +648,8 @@ public class JMeterUtils implements Unit
* @return The TestSamples value
*/
public static String[] getTestSamples(Properties properties, String name) {
- return getVector(properties, name + ".testsample").toArray(new String[0]); // $NON-NLS-1$
+ Vector<String> vector = getVector(properties, name + ".testsample"); // $NON-NLS-1$
+ return vector.toArray(new String[vector.size()]);
}
/**
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Tue Jan 3 19:12:10 2012
@@ -179,7 +179,7 @@ public final class ClassFinder {
}
}
}
- return fullList.toArray(new String[0]);
+ return fullList.toArray(new String[fullList.size()]);
}
/**
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Tue Jan 3 19:12:10 2012
@@ -158,7 +158,7 @@ public final class JOrphanUtils {
if (lastWasDelim) {
strList.add(def);
}
- return strList.toArray(new String[0]);
+ return strList.toArray(new String[strList.size()]);
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java Tue Jan 3 19:12:10 2012
@@ -62,14 +62,15 @@ public class AccessLogSamplerBeanInfo ex
if (log.isDebugEnabled()) {
log.debug("found parsers: " + logParserClasses);
}
- p.setValue(TAGS, logParserClasses.toArray(new String[0]));
+ p.setValue(TAGS, logParserClasses.toArray(new String[logParserClasses.size()]));
p = property("filterClassName"); // $NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.FALSE);
p.setValue(DEFAULT, ""); // $NON-NLS-1$
p.setValue(NOT_EXPRESSION, Boolean.TRUE);
- p.setValue(TAGS, ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
- new Class[] { Filter.class }, false).toArray(new String[0]));
+ List<String> classes = ClassFinder.findClassesThatExtend(JMeterUtils.getSearchPaths(),
+ new Class[] { Filter.class }, false);
+ p.setValue(TAGS, classes.toArray(new String[classes.size()]));
p = property("logFile"); // $NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Tue Jan 3 19:12:10 2012
@@ -1546,7 +1546,7 @@ public abstract class HTTPSamplerBase ex
}
public static String[] getValidMethodsAsArray(){
- return METHODLIST.toArray(new String[0]);
+ return METHODLIST.toArray(new String[METHODLIST.size()]);
}
public static boolean isSecure(String protocol){
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java?rev=1226923&r1=1226922&r2=1226923&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java Tue Jan 3 19:12:10 2012
@@ -149,7 +149,7 @@ public class BSFSamplerGui extends Abstr
p.put("jexl", ""); // $NON-NLS-1$
Set<Object> keySet = p.keySet();
// TODO - perhaps weed out ones which don't exist?
- String [] items = keySet.toArray(new String[]{});
+ String [] items = keySet.toArray(new String[keySet.size()]);
Arrays.sort(items);
langField = new JComboBox(items);