You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/12/02 08:50:04 UTC

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

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
                 {