Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 20786 invoked from network); 2 Jan 2007 19:49:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2007 19:49:21 -0000 Received: (qmail 31612 invoked by uid 500); 2 Jan 2007 19:49:28 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 31584 invoked by uid 500); 2 Jan 2007 19:49: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 31573 invoked by uid 99); 2 Jan 2007 19:49:27 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jan 2007 11:49:27 -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; Tue, 02 Jan 2007 11:48:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 683C81A981A; Tue, 2 Jan 2007 11:47:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r491910 - in /directory/trunks/ldapstudio/ldapstudio-browser-core/src/main: java/org/apache/directory/ldapstudio/browser/core/internal/model/ java/org/apache/directory/ldapstudio/browser/core/model/ resources/org/apache/directory/ldapstudio... Date: Tue, 02 Jan 2007 19:47:44 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070102194744.683C81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Tue Jan 2 11:47:43 2007 New Revision: 491910 URL: http://svn.apache.org/viewvc?view=rev&rev=491910 Log: Fixed missing OID mappings Added: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/resources/org/apache/directory/ldapstudio/browser/core/model/ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/resources/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt - copied, changed from r491871, directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt Removed: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java Modified: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java?view=diff&rev=491910&r1=491909&r2=491910 ============================================================================== --- directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java (original) +++ directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/internal/model/RootDSE.java Tue Jan 2 11:47:43 2007 @@ -45,7 +45,10 @@ { URL url = RootDSE.class.getClassLoader().getResource( "org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt" ); //$NON-NLS-1$ - oidMap.load( url.openStream() ); + if(url != null) + { + oidMap.load( url.openStream() ); + } } catch ( Exception e ) { Copied: directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/resources/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt (from r491871, directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt) URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/resources/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt?view=diff&rev=491910&p1=directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/java/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt&r1=491871&p2=directory/trunks/ldapstudio/ldapstudio-browser-core/src/main/resources/org/apache/directory/ldapstudio/browser/core/model/ldap_oids.txt&r2=491910 ============================================================================== (empty)