diff options
Diffstat (limited to 'libjava/classpath/org/omg/CosNaming')
21 files changed, 182 insertions, 18 deletions
diff --git a/libjava/classpath/org/omg/CosNaming/BindingHelper.java b/libjava/classpath/org/omg/CosNaming/BindingHelper.java index 1665464ec7e..b5b42077218 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -74,7 +76,10 @@ public abstract class BindingHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION("Binding expected"); + BAD_OPERATION bad = new BAD_OPERATION("Binding expected"); + bad.minor = Minor.Any; + bad.initCause(ex); + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java index 204d9f05872..64f7b4dfa51 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class BindingIteratorHelper { BAD_OPERATION bad = new BAD_OPERATION("Binding iterator expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } @@ -121,6 +124,35 @@ public abstract class BindingIteratorHelper return new _BindingIteratorStub(delegate); } } + + /** + * Narrow the given object to the BindingIterator. No type-checking is + * performed to verify that the object actually supports the requested type. + * The {@link BAD_OPERATION} will be thrown if unsupported operations are + * invoked on the new returned reference, but no failure is expected at the + * time of the unchecked_narrow. + * + * @param obj the object to cast. + * + * @return the casted binding iterator. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static BindingIterator unchecked_narrow(org.omg.CORBA.Object obj) + { + if (obj == null) + return null; + else if (obj instanceof BindingIterator) + return (BindingIterator) obj; + else + { + // Do not call the _is_a(..). + Delegate delegate = ((ObjectImpl) obj)._get_delegate(); + return new _BindingIteratorStub(delegate); + } + } /** * Read the exception from the given CDR stream. diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java index 1aa7521fbb2..988c4ee9126 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java +++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.portable.InputStream; @@ -103,7 +105,8 @@ public abstract class BindingIteratorPOA out = rh.createReply(); } else - throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(method, Minor.Method, + CompletionStatus.COMPLETED_MAYBE); return out; } diff --git a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java index ede00008ea7..2f0dc71c4ef 100644 --- a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java +++ b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -71,6 +73,7 @@ public abstract class BindingTypeHelper { BAD_OPERATION bad = new BAD_OPERATION("Binding type expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/IstringHelper.java b/libjava/classpath/org/omg/CosNaming/IstringHelper.java index 83bbecee5af..b90b452e69f 100644 --- a/libjava/classpath/org/omg/CosNaming/IstringHelper.java +++ b/libjava/classpath/org/omg/CosNaming/IstringHelper.java @@ -38,7 +38,7 @@ exception statement from your version. */ package org.omg.CosNaming; -import gnu.CORBA.Restricted_ORB; +import gnu.CORBA.OrbRestricted; import org.omg.CORBA.Any; import org.omg.CORBA.ORB; @@ -84,7 +84,7 @@ public abstract class IstringHelper */ public static TypeCode type() { - ORB orb = Restricted_ORB.Singleton; + ORB orb = OrbRestricted.Singleton; return orb.create_alias_tc(id(), "Istring", orb.create_string_tc(0)); } diff --git a/libjava/classpath/org/omg/CosNaming/NameComponent.java b/libjava/classpath/org/omg/CosNaming/NameComponent.java index a2db313e620..1e06caaeffe 100644 --- a/libjava/classpath/org/omg/CosNaming/NameComponent.java +++ b/libjava/classpath/org/omg/CosNaming/NameComponent.java @@ -40,6 +40,8 @@ package org.omg.CosNaming; import org.omg.CORBA.portable.IDLEntity; +import java.util.zip.Adler32; + /** * The name component, a node in the multi-comonent name. * @@ -115,4 +117,14 @@ public final class NameComponent { return id + "." + kind; } -}
\ No newline at end of file + + /** + * Return the hashCode of this NameComponent. + */ + public int hashCode() + { + Adler32 adler = new Adler32(); + adler.update(toString().getBytes()); + return (int) adler.getValue() & Integer.MAX_VALUE; + } +} diff --git a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java index 9f0e1287efd..8499edfe66e 100644 --- a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -76,6 +78,7 @@ public abstract class NameComponentHelper { BAD_OPERATION bad = new BAD_OPERATION("Name component expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NameHelper.java b/libjava/classpath/org/omg/CosNaming/NameHelper.java index 047ad918f93..18faf31823b 100644 --- a/libjava/classpath/org/omg/CosNaming/NameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NameHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -77,6 +79,7 @@ public abstract class NameHelper { BAD_OPERATION bad = new BAD_OPERATION("Name expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java index 6e2ef060b9a..86bf8c55dfd 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class NamingContextExtHelper { BAD_OPERATION bad = new BAD_OPERATION("NamingContextExt expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } @@ -122,6 +125,35 @@ public abstract class NamingContextExtHelper return new _NamingContextExtStub(delegate); } } + + /** + * Narrow the given object to the NamingContextExt. No type-checking is + * performed to verify that the object actually supports the requested type. + * The {@link BAD_OPERATION} will be thrown if unsupported operations are + * invoked on the new returned reference, but no failure is expected at the + * time of the unchecked_narrow. + * + * @param obj the object to cast. + * + * @return the casted NamingContextExt + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static NamingContextExt unchecked_narrow(org.omg.CORBA.Object obj) + { + if (obj == null) + return null; + else if (obj instanceof NamingContextExt) + return (NamingContextExt) obj; + else + { + // Do not call the _is_a(..). + Delegate delegate = ((ObjectImpl) obj)._get_delegate(); + return new _NamingContextExtStub(delegate); + } + } /** * Read the extended naming context from the given CDR input stream. diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java index a6d3346f82c..cf5d7b3d808 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.ObjectHelper; @@ -189,7 +191,7 @@ public abstract class NamingContextExtPOA OutputStream out = null; Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java index 3a60d9cb4de..fb9b091a6a0 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BAD_PARAM; @@ -78,6 +80,7 @@ public abstract class NamingContextHelper { BAD_OPERATION bad = new BAD_OPERATION("Naming context expected"); bad.initCause(ex); + bad.minor = Minor.Any; throw bad; } } @@ -130,6 +133,35 @@ public abstract class NamingContextHelper else throw new BAD_PARAM(); } + + /** + * Narrow the given object to the NamingContext. No type-checking is performed + * to verify that the object actually supports the requested type. The + * {@link BAD_OPERATION} will be thrown if unsupported operations are invoked + * on the new returned reference, but no failure is expected at the time of + * the unchecked_narrow. + * + * @param obj the object to cast. + * + * @return the casted NamingContext. + * + * @since 1.5 + * + * @see OMG issue 4158. + */ + public static NamingContext unchecked_narrow(org.omg.CORBA.Object obj) + { + if (obj == null) + return null; + else if (obj instanceof NamingContext) + return (NamingContext) obj; + else + { + // Do not call the _is_a(..). + Delegate delegate = ((ObjectImpl) obj)._get_delegate(); + return new _NamingContextStub(delegate); + } + } /** * Read the naming context from the given CDR input stream. diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java index a2db0ad3502..a9788827642 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.ObjectHelper; @@ -92,7 +94,7 @@ public abstract class NamingContextPOA OutputStream out = null; Integer call_method = (Integer) _NamingContextImplBase.methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java index 9487895213c..6bf7bd7a6b3 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class AlreadyBoundHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java index d1a1da51e4e..1d0b6049b66 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -78,7 +80,10 @@ public abstract class CannotProceedHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java index 434713b2d6f..8f1133602d7 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class InvalidNameHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java index e1f82994f9e..6333dfcbcd3 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -75,7 +77,10 @@ public abstract class NotEmptyHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java index 544ab63776f..442b7db9e63 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -77,7 +79,10 @@ public abstract class NotFoundHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java index b6eacf85f90..45a42a0ba70 100644 --- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java +++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming.NamingContextPackage; +import gnu.CORBA.Minor; + import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.ORB; @@ -74,7 +76,10 @@ public abstract class NotFoundReasonHelper } catch (ClassCastException ex) { - throw new BAD_OPERATION(); + BAD_OPERATION bad = new BAD_OPERATION(); + bad.initCause(ex); + bad.minor = Minor.Any; + throw bad; } } diff --git a/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java b/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java index 53c0dd3a656..9c7e1b34728 100644 --- a/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java +++ b/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.BooleanHolder; import org.omg.CORBA.CompletionStatus; @@ -114,7 +116,8 @@ public abstract class _BindingIteratorImplBase out = rh.createReply(); } else - throw new BAD_OPERATION(method, 0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(method, Minor.Method, + CompletionStatus.COMPLETED_MAYBE); return out; } diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java b/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java index 3ad77203084..a0bc80ac08d 100644 --- a/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java +++ b/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java @@ -38,7 +38,7 @@ exception statement from your version. */ package org.omg.CosNaming; -import gnu.CORBA.NamingService.snConverter; +import gnu.CORBA.NamingService.NameTransformer; import org.omg.CORBA.MARSHAL; import org.omg.CORBA.ObjectHelper; @@ -86,7 +86,7 @@ public class _NamingContextExtStub /** * The local name form converter. */ - private snConverter converter = new snConverter(); + private NameTransformer converter = new NameTransformer(); /** * Create the naming context stub. diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java index 7c1fb3a1d1e..33bddef5d74 100644 --- a/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java +++ b/libjava/classpath/org/omg/CosNaming/_NamingContextImplBase.java @@ -38,6 +38,8 @@ exception statement from your version. */ package org.omg.CosNaming; +import gnu.CORBA.Minor; + import org.omg.CORBA.BAD_OPERATION; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.DynamicImplementation; @@ -123,7 +125,7 @@ public abstract class _NamingContextImplBase OutputStream out = null; Integer call_method = (Integer) methods.get(method); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { @@ -389,7 +391,7 @@ public abstract class _NamingContextImplBase // The server request contains no required result type. Integer call_method = (Integer) methods.get(request.operation()); if (call_method == null) - throw new BAD_OPERATION(0, CompletionStatus.COMPLETED_MAYBE); + throw new BAD_OPERATION(Minor.Method, CompletionStatus.COMPLETED_MAYBE); switch (call_method.intValue()) { |