User: starksm
Date: 01/09/08 20:29:17
Modified: src/main/org/jnp/server Tag: Branch_2_4 NamingServer.java
Log:
The createSubcontext() usage of getObject() was not correct so revert
to previous mode of dealing with names > size 1
Revision Changes Path
No revision
No revision
1.6.4.2 +10 -14 jnp/src/main/org/jnp/server/NamingServer.java
Index: NamingServer.java
===================================================================
RCS file: /cvsroot/jboss/jnp/src/main/org/jnp/server/NamingServer.java,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- NamingServer.java 2001/09/07 02:56:55 1.6.4.1
+++ NamingServer.java 2001/09/09 03:29:17 1.6.4.2
@@ -40,7 +40,7 @@
*
* @see <related>
* @author $Author: starksm $
- * @version $Revision: 1.6.4.1 $
+ * @version $Revision: 1.6.4.2 $
*/
public class NamingServer
implements Naming, java.io.Serializable
@@ -402,16 +402,13 @@
Context subCtx = null;
if (name.size() > 1)
{
- // Get the target ctx for the creation
- int targetSize = name.size() - 1;
- Name targetName = name.getPrefix(targetSize);
- Name atom = name.getSuffix(targetSize);
- Object ctx = getObject(targetName);
+ Object ctx = getObject(name);
if (ctx != null)
{
+ Name subCtxName = name.getSuffix(1);
if (ctx instanceof NamingServer)
{
- subCtx = ((NamingServer)ctx).createSubcontext(atom);
+ subCtx = ((NamingServer)ctx).createSubcontext(subCtxName);
}
else if (ctx instanceof Reference)
{
@@ -420,30 +417,29 @@
{
CannotProceedException cpe = new CannotProceedException();
cpe.setResolvedObj(ctx);
- cpe.setRemainingName(atom);
+ cpe.setRemainingName(subCtxName);
throw cpe;
}
else
{
ex = new NotContextException();
- ex.setResolvedName(targetName);
- ex.setRemainingName(atom);
+ ex.setResolvedName(name.getPrefix(0));
+ ex.setRemainingName(subCtxName);
throw ex;
}
}
else
{
ex = new NotContextException();
- ex.setResolvedName(targetName);
- ex.setRemainingName(atom);
+ ex.setResolvedName(name.getPrefix(0));
+ ex.setRemainingName(subCtxName);
throw ex;
}
}
else
{
ex = new NameNotFoundException();
- ex.setResolvedName(targetName);
- ex.setRemainingName(atom);
+ ex.setRemainingName(name);
throw ex;
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
