Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CF3BECF2A for ; Fri, 14 Jun 2013 15:40:33 +0000 (UTC) Received: (qmail 61906 invoked by uid 500); 14 Jun 2013 15:40:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61779 invoked by uid 500); 14 Jun 2013 15:40:32 -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 60770 invoked by uid 99); 14 Jun 2013 15:40:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 15:40:30 +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; Fri, 14 Jun 2013 15:40:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1E24823889F1; Fri, 14 Jun 2013 15:40:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1493124 - /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Date: Fri, 14 Jun 2013 15:40:08 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130614154008.1E24823889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Jun 14 15:40:07 2013 New Revision: 1493124 URL: http://svn.apache.org/r1493124 Log: Fix for DIRSTUDIO-919 (Invalid thread access when saving an new ApacheDS 2.0 configuration file) Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java?rev=1493124&r1=1493123&r2=1493124&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Fri Jun 14 15:40:07 2013 @@ -151,8 +151,7 @@ public class ServerConfigurationEditorUt while ( !canOverwrite ) { // Open FileDialog - final FileDialog dialog = new FileDialog( shell, SWT.SAVE ); - path = openFileDialogInUIThread( dialog ); + path = openFileDialogInUIThread( shell ); if ( path == null ) { return null; @@ -245,12 +244,12 @@ public class ServerConfigurationEditorUt /** * Opens a {@link FileDialog} in the UI thread. * - * @param dialog - * the file dialog + * @param shell + * the shell * @return * the result of the dialog */ - private static String openFileDialogInUIThread( final FileDialog dialog ) + private static String openFileDialogInUIThread( final Shell shell ) { // Defining our own encapsulating class for the result class DialogResult @@ -278,6 +277,7 @@ public class ServerConfigurationEditorUt { public void run() { + FileDialog dialog = new FileDialog( shell, SWT.SAVE ); result.setResult( dialog.open() ); } } );