From f0dc1efacea75da01f2f5d3889c6f67a46864a95 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Wed, 29 Oct 2003 14:54:00 +0000 Subject: NamingManager.java (getContinuationContext): Call getObjectInstance() with Object... 2003-10-29 Julian Dolby * javax/naming/spi/NamingManager.java (getContinuationContext): Call getObjectInstance() with Object, Name, Context and environment Hashtable from exception. Call fillInStackTrace() on exception when rethrown. * javax/naming/InitialContext.java (lookup(Name)): When a CannotProceedException is thrown use the ContinuationContext. (lookup(String)): Likewise. (close): Clear myProps and defaultInitCtx. From-SVN: r73041 --- libjava/javax/naming/spi/NamingManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libjava/javax/naming/spi') diff --git a/libjava/javax/naming/spi/NamingManager.java b/libjava/javax/naming/spi/NamingManager.java index 65ce2d2..af9ddc3 100644 --- a/libjava/javax/naming/spi/NamingManager.java +++ b/libjava/javax/naming/spi/NamingManager.java @@ -324,8 +324,10 @@ public class NamingManager // It is really unclear to me if this is right. try { - Object obj = getObjectInstance (null, cpe.getAltName (), - cpe.getAltNameCtx (), env); + Object obj = getObjectInstance (cpe.getResolvedObj(), + cpe.getAltName (), + cpe.getAltNameCtx (), + env); if (obj != null) return (Context) obj; } @@ -333,6 +335,9 @@ public class NamingManager { } + // fix stack trace for re-thrown exception (message confusing otherwise) + cpe.fillInStackTrace(); + throw cpe; } -- cgit v1.1