Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 20677 invoked from network); 1 Mar 2009 22:55:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Mar 2009 22:55:58 -0000 Received: (qmail 3577 invoked by uid 500); 1 Mar 2009 22:55:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 3530 invoked by uid 500); 1 Mar 2009 22:55:57 -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 3521 invoked by uid 99); 1 Mar 2009 22:55:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Mar 2009 14:55:57 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 01 Mar 2009 22:55:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A97323889BB; Sun, 1 Mar 2009 22:55:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749146 - in /directory/studio/trunk: connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Date: Sun, 01 Mar 2009 22:55:35 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090301225536.0A97323889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sun Mar 1 22:55:35 2009 New Revision: 749146 URL: http://svn.apache.org/viewvc?rev=749146&view=rev Log: DIRSTUDIO-409: Exception handling in wizards Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java?rev=749146&r1=749145&r2=749146&view=diff ============================================================================== --- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java (original) +++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java Sun Mar 1 22:55:35 2009 @@ -82,7 +82,10 @@ monitor.worked( 1 ); connection.getJNDIConnectionWrapper().connect( monitor ); - connection.getJNDIConnectionWrapper().bind( monitor ); + if ( connection.getJNDIConnectionWrapper().isConnected() ) + { + connection.getJNDIConnectionWrapper().bind( monitor ); + } if ( connection.getJNDIConnectionWrapper().isConnected() ) { Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java?rev=749146&r1=749145&r2=749146&view=diff ============================================================================== --- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java (original) +++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Sun Mar 1 22:55:35 2009 @@ -83,7 +83,10 @@ spm[0].worked( 1 ); connection.getJNDIConnectionWrapper().connect( spm[0] ); - connection.getJNDIConnectionWrapper().bind( spm[0] ); + if ( connection.getJNDIConnectionWrapper().isConnected() ) + { + connection.getJNDIConnectionWrapper().bind( spm[0] ); + } if ( connection.getJNDIConnectionWrapper().isConnected() ) { @@ -98,27 +101,39 @@ } } - //runnable.run( spm[0] ); - if ( runnable instanceof StudioBulkRunnableWithProgress ) + if ( !spm[0].errorsReported() ) { - StudioBulkRunnableWithProgress bulkRunnable = ( StudioBulkRunnableWithProgress ) runnable; - ConnectionEventRegistry.suspendEventFireingInCurrentThread(); try { - bulkRunnable.run( spm[0] ); + if ( runnable instanceof StudioBulkRunnableWithProgress ) + { + StudioBulkRunnableWithProgress bulkRunnable = ( StudioBulkRunnableWithProgress ) runnable; + ConnectionEventRegistry.suspendEventFireingInCurrentThread(); + try + { + bulkRunnable.run( spm[0] ); + } + finally + { + ConnectionEventRegistry.resumeEventFireingInCurrentThread(); + } + bulkRunnable.runNotification(); + } + else + { + runnable.run( spm[0] ); + } + } + catch ( Exception e ) + { + spm[0].reportError( e ); } finally { - ConnectionEventRegistry.resumeEventFireingInCurrentThread(); + spm[0].done(); + monitor.done(); } - bulkRunnable.runNotification(); } - else - { - runnable.run( spm[0] ); - } - - spm[0].done(); } };