You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2007/01/03 14:42:38 UTC
svn commit: r492148 -
/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/spi/DirectoryManager.java
Author: tellison
Date: Wed Jan 3 05:42:37 2007
New Revision: 492148
URL: http://svn.apache.org/viewvc?view=rev&rev=492148
Log:
Apply patch HARMONY-547 ([classlib][jndi] dead code in javax.naming.spi.DirectoryManager)
Modified:
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/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=492148&r1=492147&r2=492148
==============================================================================
--- 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 Wed Jan 3 05:42:37 2007
@@ -418,12 +418,9 @@
if (nextContext instanceof DirContext) {
// return as DirContext
return (DirContext) nextContext;
- } else if (nextContext != null) {
+ } else {
// in case it's Context but not DirContext, wrap it as DirContext and return
return new Context2DirContextWrapper(nextContext, cpe);
- } else {
- // return a dummy DirContext, even if no context is obtained
- return new Context2DirContextWrapper(null, cpe);
}
}