You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2007/07/25 05:46:56 UTC

svn commit: r559308 - in /harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming: NameParser.java spi/DirectoryManager.java

Author: pyang
Date: Tue Jul 24 20:46:55 2007
New Revision: 559308

URL: http://svn.apache.org/viewvc?view=rev&rev=559308
Log:
Apply patch for HARMONY-4528(Signature mismatches in jndi code)

Modified:
    harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NameParser.java
    harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java

Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NameParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NameParser.java?view=diff&rev=559308&r1=559307&r2=559308
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NameParser.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/NameParser.java Tue Jul 24 20:46:55 2007
@@ -38,6 +38,6 @@
      *             when the supplied string violates format rules
      * @throws NamingException
      */
-    public Name parse(String s) throws InvalidNameException, NamingException;
+    public Name parse(String s) throws NamingException;
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java?view=diff&rev=559308&r1=559307&r2=559308
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java Tue Jul 24 20:46:55 2007
@@ -104,7 +104,7 @@
      *             if any other exception is encountered
      */
     public static Object getObjectInstance(Object o, Name n, Context c,
-            Hashtable<?, ?> h, Attributes a) throws NamingException, Exception {
+            Hashtable<?, ?> h, Attributes a) throws Exception {
 
         // 1. try ObjectFactoryBuilder, if it is set
         if (null != ofb) {