Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 12486 invoked from network); 22 Mar 2010 15:35:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Mar 2010 15:35:27 -0000 Received: (qmail 72763 invoked by uid 500); 22 Mar 2010 15:35:27 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 72729 invoked by uid 500); 22 Mar 2010 15:35: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 72722 invoked by uid 99); 22 Mar 2010 15:35:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Mar 2010 15:35:27 +0000 X-ASF-Spam-Status: No, hits=-1080.6 required=10.0 tests=ALL_TRUSTED,AWL 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; Mon, 22 Mar 2010 15:35:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4CACB2388980; Mon, 22 Mar 2010 15:35:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r926136 - /directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Date: Mon, 22 Mar 2010 15:35:06 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100322153506.4CACB2388980@eris.apache.org> Author: seelmann Date: Mon Mar 22 15:35:05 2010 New Revision: 926136 URL: http://svn.apache.org/viewvc?rev=926136&view=rev Log: Fix for DIRSTUDIO-639 ( Exception when navigation history contains bookmarks of an deleted connection) Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=926136&r1=926135&r2=926136&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original) +++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Mon Mar 22 15:35:05 2010 @@ -34,6 +34,7 @@ import org.apache.directory.studio.ldapb import org.apache.directory.studio.ldapbrowser.core.model.IAttribute; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.IEntry; +import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.utils.Utils; import org.eclipse.search.ui.ISearchPageScoreComputer; @@ -96,7 +97,7 @@ public abstract class DelegateEntry impl .getBrowserConnectionById( connectionId ); if ( browserConnection == null ) { - throw new IllegalStateException( "Connection " + connectionId + " does not exist." ); + browserConnection = new DummyConnection( Schema.DEFAULT_SCHEMA ); } // always get the fresh entry from cache @@ -139,7 +140,7 @@ public abstract class DelegateEntry impl .getBrowserConnectionById( connectionId ); if ( browserConnection == null ) { - throw new IllegalStateException( "Connection " + connectionId + " does not exist." ); + browserConnection = new DummyConnection( Schema.DEFAULT_SCHEMA ); } return browserConnection; }