From commits-return-6902-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Sun Nov 06 03:35:58 2005 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 17948 invoked from network); 6 Nov 2005 03:35:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Nov 2005 03:35:58 -0000 Received: (qmail 72280 invoked by uid 500); 6 Nov 2005 03:35:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 72252 invoked by uid 500); 6 Nov 2005 03:35: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 72241 invoked by uid 99); 6 Nov 2005 03:35:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Nov 2005 19:35:56 -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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 05 Nov 2005 19:35:51 -0800 Received: (qmail 17895 invoked by uid 65534); 6 Nov 2005 03:35:35 -0000 Message-ID: <20051106033535.17894.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r331064 - /directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java Date: Sun, 06 Nov 2005 03:35:35 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Sat Nov 5 19:35:33 2005 New Revision: 331064 URL: http://svn.apache.org/viewcvs?rev=331064&view=rev Log: slight modification to improve loading of files on classpath Modified: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java Modified: directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java URL: http://svn.apache.org/viewcvs/directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java?rev=331064&r1=331063&r2=331064&view=diff ============================================================================== --- directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java (original) +++ directory/shared/protocol/trunk/common/src/main/java/org/apache/protocol/common/store/LdifFileLoader.java Sat Nov 5 19:35:33 2005 @@ -240,11 +240,18 @@ { // if file not on system see if something is bundled with the jar ... in = getClass().getResourceAsStream( ldif.getName() ); - - if ( in == null ) + if ( in != null ) + { + return in; + } + + in = ClassLoader.getSystemResourceAsStream( ldif.getName() ); + if ( in != null ) { - throw new FileNotFoundException( "LDIF file does not exist." ); + return in; } + + throw new FileNotFoundException( "LDIF file does not exist." ); } return in;