Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A3D15DB7E for ; Sat, 1 Sep 2012 21:06:56 +0000 (UTC) Received: (qmail 9901 invoked by uid 500); 1 Sep 2012 21:06:56 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 9876 invoked by uid 500); 1 Sep 2012 21:06:56 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 9868 invoked by uid 99); 1 Sep 2012 21:06:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Sep 2012 21:06:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Sep 2012 21:06:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A379023889C5 for ; Sat, 1 Sep 2012 21:06:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120901210610.A379023889C5@eris.apache.org> 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: