From directory-cvs-return-2290-apmail-incubator-directory-cvs-archive=incubator.apache.org@incubator.apache.org Thu Dec 02 07:50:09 2004 Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 2807 invoked from network); 2 Dec 2004 07:50:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Dec 2004 07:50:08 -0000 Received: (qmail 39073 invoked by uid 500); 2 Dec 2004 07:50:08 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 39021 invoked by uid 500); 2 Dec 2004 07:50:07 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 39005 invoked by uid 99); 2 Dec 2004 07:50:07 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 01 Dec 2004 23:50:07 -0800 Received: (qmail 2762 invoked by uid 65534); 2 Dec 2004 07:50:04 -0000 Date: 2 Dec 2004 07:50:04 -0000 Message-ID: <20041202075004.2757.qmail@minotaur.apache.org> From: akarasulu@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: r109471 - /incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java /incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Wed Dec 1 23:50:03 2004 New Revision: 109471 URL: http://svn.apache.org/viewcvs?view=rev&rev=109471 Log: Changes ... o was not reporting some exceptions that were wrapped in invocation target exceptions within the interceptor procession within the JNDI provider o fixed NPE that was hidden (revieled due to above) in SubstringEvaluator Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java?view=diff&rev=109471&p1=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java&r1=109470&p2=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java&r2=109471 ============================================================================== --- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java (original) +++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/db/SubstringEvaluator.java Wed Dec 1 23:50:03 2004 @@ -122,8 +122,7 @@ // Index not defined beyond this point // -------------------------------------------------------------------- - Attribute attr = null; - String oid = oidRegistry.getOid( attr.getID() ); + String oid = oidRegistry.getOid( snode.getAttribute() ); AttributeType type = attributeTypeRegistry.lookup( oid ); Normalizer normalizer = type.getSubstr().getNormalizer(); @@ -135,7 +134,7 @@ } // get the attribute - attr = record.getAttributes().get( snode.getAttribute() ); + Attribute attr = record.getAttributes().get( snode.getAttribute() ); // if the attribute does not exist just return false if ( null == attr ) Modified: incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java?view=diff&rev=109471&p1=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java&r1=109470&p2=incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java&r2=109471 ============================================================================== --- incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java (original) +++ incubator/directory/eve/trunk/jndi-provider/src/java/org/apache/eve/jndi/EveJndiProvider.java Wed Dec 1 23:50:03 2004 @@ -220,6 +220,11 @@ { target = ( NamingException ) ite.getTargetException(); } + else + { + target = new NamingException(); + target.setRootCause( ite.getTargetException() ); + } } else {