jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1379851 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/util/IconToolbarBean.java testbeans/gui/FileEditor.java
Date Sat, 01 Sep 2012 21:06:10 GMT
Author: pmouawad
Date: Sat Sep  1 21:06:10 2012
New Revision: 1379851

URL: http://svn.apache.org/viewvc?rev=1379851&view=rev
Log:
Avoid throwing NPE

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
    jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java?rev=1379851&r1=1379850&r2=1379851&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java Sat Sep  1 21:06:10
2012
@@ -43,9 +43,9 @@ public final class IconToolbarBean {
      * @param strToSplit - the line value (i18n key, ActionNames ID, icon path, optional
icon pressed path)
      * @throws JMeterException if error in parsing.
      */
-    IconToolbarBean(final String strToSplit) throws NullPointerException, IllegalArgumentException
{
+    IconToolbarBean(final String strToSplit) throws IllegalArgumentException {
         if (strToSplit == null) {
-            throw new NullPointerException("Icon definition must not be null"); //$NON-NLS-1$
+            throw new IllegalArgumentException("Icon definition must not be null"); //$NON-NLS-1$
         }
         final String tmp[] = strToSplit.split(ICON_FIELD_SEP);
         if (tmp.length > 2) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=1379851&r1=1379850&r2=1379851&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Sat Sep  1 21:06:10
2012
@@ -66,7 +66,7 @@ public class FileEditor implements Prope
 
     public FileEditor(PropertyDescriptor descriptor) {
         if (descriptor == null) {
-            throw new NullPointerException("Descriptor must not be null");
+            throw new IllegalArgumentException("Descriptor must not be null");
         }
 
         // Create a button to trigger the file chooser:



Mime
View raw message