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 BA4A4F1B1 for ; Wed, 20 Mar 2013 17:08:05 +0000 (UTC) Received: (qmail 64021 invoked by uid 500); 20 Mar 2013 17:08:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 63844 invoked by uid 500); 20 Mar 2013 17:08:01 -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 63815 invoked by uid 99); 20 Mar 2013 17:07:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 17:07:59 +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; Wed, 20 Mar 2013 17:07:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A74C1238889B; Wed, 20 Mar 2013 17:07:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1458955 - /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java Date: Wed, 20 Mar 2013 17:07:36 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130320170736.A74C1238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Mar 20 17:07:36 2013 New Revision: 1458955 URL: http://svn.apache.org/r1458955 Log: Fix for DIRSTUDIO-891 (A schema project containing a reference to a deleted connection makes the perspective completely unusable). Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java?rev=1458955&r1=1458954&r2=1458955&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java Wed Mar 20 17:07:36 2013 @@ -22,6 +22,7 @@ package org.apache.directory.studio.sche import java.util.List; +import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.schemaeditor.model.Project; import org.apache.directory.studio.schemaeditor.model.ProjectType; import org.apache.directory.studio.schemaeditor.model.Schema; @@ -128,11 +129,21 @@ public class ProjectsExporter // If project is an Online Schema Project if ( type.equals( ProjectType.ONLINE ) ) { - // Connection Name - element.addAttribute( CONNECTION_TAG, project.getConnection().getId() ); + // Connection ID + Connection connection = project.getConnection(); - // Connection Name - element.addAttribute( SCHEMA_CONNECTOR_TAG, project.getSchemaConnector().getId() ); + if ( connection != null ) + { + element.addAttribute( CONNECTION_TAG, connection.getId() ); + } + + // Schema Connection ID + SchemaConnector schemaConnector = project.getSchemaConnector(); + + if ( schemaConnector != null ) + { + element.addAttribute( SCHEMA_CONNECTOR_TAG, project.getSchemaConnector().getId() ); + } // Schema Backup Element schemaBackupElement = element.addElement( SCHEMA_BACKUP_TAG );