Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 33623 invoked from network); 19 Jan 2007 12:45:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jan 2007 12:45:20 -0000 Received: (qmail 43291 invoked by uid 500); 19 Jan 2007 12:45:27 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 43246 invoked by uid 500); 19 Jan 2007 12:45:27 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 43232 invoked by uid 99); 19 Jan 2007 12:45:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 04:45:26 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2007 04:45:19 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A6CB51A981D; Fri, 19 Jan 2007 04:43:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497794 - /directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java Date: Fri, 19 Jan 2007 12:43:36 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070119124336.A6CB51A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Jan 19 04:43:35 2007 New Revision: 497794 URL: http://svn.apache.org/viewvc?view=rev&rev=497794 Log: Fixing a bug in the DSML Export Job that caused a NullPointerException to be raised if the Controls were null. Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java?view=diff&rev=497794&r1=497793&r2=497794 ============================================================================== --- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java (original) +++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/jobs/ExportDsmlJob.java Fri Jan 19 04:43:35 2007 @@ -436,9 +436,12 @@ { List returnList = new ArrayList(); - for ( int i = 0; i < controls.length; i++ ) + if ( controls != null) { - returnList.add( convertToSharedLDAP( controls[i] ) ); + for ( int i = 0; i < controls.length; i++ ) + { + returnList.add( convertToSharedLDAP( controls[i] ) ); + } } return returnList;