You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ri...@apache.org on 2007/07/06 10:52:18 UTC
svn commit: r553831 [3/5] - in
/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb: CORBA/
CosNaming/ DynamicAny/ IMR/ OAD/ OB/ OB/BootManagerPackage/
OB/CorbalocProtocolPackage/ OB/CorbalocURLSchemePackage/
OB/URLRegistryPackage/ OBPortableIn...
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InitialServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InitialServiceManager.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InitialServiceManager.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InitialServiceManager.java Fri Jul 6 03:52:10 2007
@@ -113,9 +113,9 @@
// if this operation is called after ORB destruction
//
if (destroy_)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String[] list = new String[services_.size()];
@@ -135,9 +135,9 @@
// if this operation is called after ORB destruction
//
if (destroy_)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
Assert._OB_assert(identifier != null);
@@ -220,9 +220,9 @@
// if this operation is called after ORB destruction
//
if (destroy_)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
Assert._OB_assert(name != null && iorString != null);
@@ -243,9 +243,9 @@
// if this operation is called after ORB destruction
//
if (destroy_)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
Assert._OB_assert(name != null);
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InterceptorPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InterceptorPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InterceptorPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InterceptorPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static InterceptorPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, InterceptorPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static InterceptorPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InvalidThreadPoolHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InvalidThreadPoolHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InvalidThreadPoolHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InvalidThreadPoolHelper.java Fri Jul 6 03:52:10 2007
@@ -36,7 +36,11 @@
if(any.type().equivalent(type()))
return read(any.create_input_stream());
else
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -64,8 +68,13 @@
public static InvalidThreadPool
read(org.omg.CORBA.portable.InputStream in)
{
- if(!id().equals(in.read_string()))
- throw new org.omg.CORBA.MARSHAL();
+ if(!id().equals(in.read_string())) {
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadIDMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadIDMismatch,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
InvalidThreadPool _ob_v = new InvalidThreadPool();
return _ob_v;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocateRequestPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocateRequestPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocateRequestPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocateRequestPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static LocateRequestPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, LocateRequestPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static LocateRequestPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocationTransparencyPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocationTransparencyPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocationTransparencyPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LocationTransparencyPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static LocationTransparencyPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, LocationTransparencyPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static LocationTransparencyPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static Logger
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, Logger val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static Logger
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MinorCodes.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MinorCodes.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MinorCodes.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MinorCodes.java Fri Jul 6 03:52:10 2007
@@ -178,7 +178,7 @@
public final static int MinorDuplicatePolicyType = 30 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorDuplicateDeclarator = 1 | OOCVMCID;
@@ -200,6 +200,14 @@
public final static int MinorConstantTypeMismatch = 10 | OOCVMCID;
+ public final static int MinorInvalidPattern = 11 | OOCVMCID;
+
+ public final static int MinorInvalidScope = 12 | OOCVMCID;
+
+ public final static int MinorInvalidContextID = 13 | OOCVMCID;
+
+ public final static int MinorIncompatibleObjectType = 14 | OOCVMCID;
+
public static String describeBadParam(int minor) {
String result = null;
@@ -363,6 +371,22 @@
case MinorConstantTypeMismatch:
result = "constant type doesn't match definition";
break;
+
+ case MinorInvalidPattern:
+ result = "invalid pattern";
+ break;
+
+ case MinorInvalidScope:
+ result = "invalid scope";
+ break;
+
+ case MinorInvalidContextID:
+ result = "invalid context ID";
+ break;
+
+ case MinorIncompatibleObjectType:
+ result = "incompatible object type";
+ break;
}
return result;
@@ -410,7 +434,7 @@
public final static int MinorNoCreatePOA = 17 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorBadConcModel = 1 | OOCVMCID;
@@ -510,7 +534,7 @@
/* None yet */
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorRecv = 1 | OOCVMCID;
@@ -569,7 +593,7 @@
public final static int MinorUnknownReplyMessage = 29 | OOCVMCID;
//
- // ORBacus deprecated minor codes
+ // Yoko deprecated minor codes
//
public final static int MinorDeprecatedCloseConnection = 20 | OOCVMCID;
@@ -699,7 +723,7 @@
/* None yet */
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorNoIntfRepos = 1 | OOCVMCID;
@@ -753,7 +777,7 @@
public final static int MinorWcharSentByServer = 6 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorReadOverflow = 1 | OOCVMCID;
@@ -832,9 +856,21 @@
public final static int MinorReadInvTypeCodeIndirection = 38 | OOCVMCID;
public final static int MinorLongDoubleNotSupported = 40 | OOCVMCID;
+
+ public final static int MinorNativeNotSupported = 41 | OOCVMCID;
+
+ public final static int MinorReadInvalidIndirection = 42 | OOCVMCID;
+
+ public final static int MinorReadIDMismatch = 43 | OOCVMCID;
+
+ public final static int MinorReadUnsupported = 44 | OOCVMCID;
+
+ public final static int MinorWriteUnsupported = 45 | OOCVMCID;
+
+ public final static int MinorLoadStub = 46 | OOCVMCID;
//
- // ORBacus deprecated minor codes
+ // Yoko deprecated minor codes
//
public final static int MinorDeprecatedWriteObjectLocal = 39 | OOCVMCID;
@@ -1022,9 +1058,33 @@
result = "long double is not supported";
break;
+ case MinorNativeNotSupported:
+ result = "long double is not supported";
+ break;
+
case MinorDeprecatedWriteObjectLocal:
result = "attempt to marshal a locality-constrained object";
break;
+
+ case MinorReadInvalidIndirection:
+ result = "invalid indirection location";
+ break;
+
+ case MinorReadIDMismatch:
+ result = "type ID mismatch";
+ break;
+
+ case MinorReadUnsupported:
+ result = "reading unsupported type";
+ break;
+
+ case MinorWriteUnsupported:
+ result = "writing unsupported type";
+ break;
+
+ case MinorLoadStub:
+ result = "error loading stub class";
+ break;
}
return result;
@@ -1040,7 +1100,7 @@
public final static int MinorNoUsableProfile = 1 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorMessageSizeLimit = 1 | OOCVMCID;
@@ -1076,7 +1136,7 @@
/* None yet */
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorAllocationFailure = 1 | OOCVMCID;
@@ -1108,7 +1168,7 @@
public final static int MinorPOADestroyed = 4 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorConnectFailed = 1 | OOCVMCID;
@@ -1226,6 +1286,11 @@
public final static int MinorNoPolicyFactory = 3 | OMGVMCID;
+ //
+ // Yoko specific minor codes
+ //
+ public final static int MinorNoPolicy = 1 | OOCVMCID;
+
public static String describeInvPolicy(int minor) {
String result = null;
@@ -1242,6 +1307,10 @@
case MinorNoPolicyFactory:
result = "no PolicyFactory for the PolicyType has been registered";
break;
+
+ case MinorNoPolicy:
+ result = "no policy for the PolicyType is available";
+ break;
}
return result;
@@ -1286,9 +1355,11 @@
public final static int MinorInvalidMemberType = 2 | OMGVMCID;
//
- // ORBacus specific minor codes
+ // Yoko specific minor codes
//
public final static int MinorInvalidUnionDiscriminator = 1 | OOCVMCID;
+
+ public final static int MinorInvalidPropertyType = 2 | OOCVMCID;
public static String describeBadTypecode(int minor) {
String result = null;
@@ -1301,8 +1372,14 @@
case MinorInvalidMemberType:
result = "invalid member type in TypeCode operation";
break;
+
case MinorInvalidUnionDiscriminator:
result = "invalid union discriminator type";
+ break;
+
+ case MinorInvalidPropertyType:
+ result = "property value does not contain a string";
+ break;
}
return result;
@@ -1362,6 +1439,16 @@
//
public final static int MinorNoCharacterMapping = 1 | OMGVMCID;
+ //
+ // Yoko specific minor codes
+ //
+
+ public final static int MinorNoAlias = 1 | OOCVMCID;
+
+ public final static int MinorUTF8Overflow = 2 | OOCVMCID;
+
+ public final static int MinorUTF8Encoding = 3 | OOCVMCID;
+
public static String describeDataConversion(int minor) {
String result = null;
@@ -1369,6 +1456,71 @@
case MinorNoCharacterMapping:
result = "character does not map to negotiated transmission "
+ "code set";
+ break;
+ case MinorNoAlias:
+ result = "alias types not supported";
+ break;
+ case MinorUTF8Overflow:
+ result = "UTF8 overflow";
+ break;
+ case MinorUTF8Encoding:
+ result = "invalid UTF8 character1";
+ break;
+ }
+
+ return result;
+ }
+
+ // ----------------------------------------------------------------------
+ // Minor error codes for BAD_OPERATION
+ // ----------------------------------------------------------------------
+
+ //
+ // Standard minor codes
+ //
+
+ //
+ // Yoko specific minor codes
+ //
+ public final static int MinorTypeMismatch = 1 | OOCVMCID;
+
+ public final static int MinorNullValueNotAllowed = 2 | OOCVMCID;
+
+ public static String describeBadOperation(int minor) {
+ String result = null;
+
+ switch (minor) {
+ case MinorTypeMismatch:
+ result = "Type mismatch";
+ break;
+
+ case MinorNullValueNotAllowed:
+ result = "Null value not allowed";
+ break;
+ }
+
+ return result;
+ }
+
+ // ----------------------------------------------------------------------
+ // Minor error codes for BAD_CONTEXT
+ // ----------------------------------------------------------------------
+
+ //
+ // Standard minor codes
+ //
+
+ //
+ // Yoko specific minor codes
+ //
+ public final static int MinorNoPatternMatch = 1 | OOCVMCID;
+
+ public static String describeBadContext(int minor) {
+ String result = null;
+
+ switch (minor) {
+ case MinorNoPatternMatch:
+ result = "No match found";
break;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MultiRequestSender.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MultiRequestSender.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MultiRequestSender.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MultiRequestSender.java Fri Jul 6 03:52:10 2007
@@ -78,9 +78,9 @@
public synchronized boolean pollNextResponse() {
if (deferredRequests_.size() == 0)
- throw new org.omg.CORBA.BAD_INV_ORDER(MinorCodes
- .describeBadInvOrder(MinorCodes.MinorRequestNotSent),
- MinorCodes.MinorRequestNotSent,
+ throw new org.omg.CORBA.BAD_INV_ORDER(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorRequestNotSent),
+ org.apache.yoko.orb.OB.MinorCodes.MinorRequestNotSent,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
@@ -122,9 +122,9 @@
return request;
}
- throw new org.omg.CORBA.BAD_INV_ORDER(MinorCodes
- .describeBadInvOrder(MinorCodes.MinorRequestNotSent),
- MinorCodes.MinorRequestNotSent,
+ throw new org.omg.CORBA.BAD_INV_ORDER(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorRequestNotSent),
+ org.apache.yoko.orb.OB.MinorCodes.MinorRequestNotSent,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ORBControl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ORBControl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ORBControl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ORBControl.java Fri Jul 6 03:52:10 2007
@@ -177,15 +177,15 @@
// error if the this operation is called after ORB destruction
//
if (state_ == StateDestroyed)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (state_ == StateServerShutdown || state_ == StateClientShutdown)
- throw new org.omg.CORBA.BAD_INV_ORDER(MinorCodes
- .describeBadInvOrder(MinorCodes.MinorShutdownCalled),
- MinorCodes.MinorShutdownCalled,
+ throw new org.omg.CORBA.BAD_INV_ORDER(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled),
+ org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (state_ == StateNotRunning) {
@@ -345,15 +345,15 @@
// if the this operation is called after ORB destruction
//
if (state_ == StateDestroyed)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (state_ == StateServerShutdown || state_ == StateClientShutdown)
- throw new org.omg.CORBA.BAD_INV_ORDER(MinorCodes
- .describeBadInvOrder(MinorCodes.MinorShutdownCalled),
- MinorCodes.MinorShutdownCalled,
+ throw new org.omg.CORBA.BAD_INV_ORDER(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled),
+ org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
@@ -388,8 +388,8 @@
if (inInvocation)
throw new org.omg.CORBA.BAD_INV_ORDER(
MinorCodes
- .describeBadInvOrder(MinorCodes.MinorDestroyWouldBlock),
- MinorCodes.MinorDestroyWouldBlock,
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorDestroyWouldBlock),
+ org.apache.yoko.orb.OB.MinorCodes.MinorDestroyWouldBlock,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
@@ -436,9 +436,9 @@
// error if the this operation is called after ORB destruction
//
if (state_ == StateDestroyed)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ObjectFactory.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ObjectFactory.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ObjectFactory.java Fri Jul 6 03:52:10 2007
@@ -71,9 +71,9 @@
// if this operation is called after ORB destruction
//
if (destroy_)
- throw new org.omg.CORBA.INITIALIZE(MinorCodes
- .describeInitialize(MinorCodes.MinorORBDestroyed),
- MinorCodes.MinorORBDestroyed,
+ throw new org.omg.CORBA.INITIALIZE(org.apache.yoko.orb.OB.MinorCodes
+ .describeInitialize(org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed),
+ org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PIDowncall.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PIDowncall.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PIDowncall.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PIDowncall.java Fri Jul 6 03:52:10 2007
@@ -68,9 +68,9 @@
orbInstance_);
org.omg.CORBA.UNKNOWN sys = new org.omg.CORBA.UNKNOWN(
MinorCodes
- .describeUnknown(MinorCodes.MinorUnknownUserException)
+ .describeUnknown(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException)
+ ": " + exId_,
- MinorCodes.MinorUnknownUserException,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException,
org.omg.CORBA.CompletionStatus.COMPLETED_YES);
org.omg.CORBA.UNKNOWNHelper.insert(any, sys);
org.omg.CORBA.UnknownUserException unk = new org.omg.CORBA.UnknownUserException(
@@ -156,9 +156,9 @@
if (state_ == DowncallStateUserException && ex_ == null
&& exId_ == null) {
String id = unmarshalExceptionId();
- setSystemException(new org.omg.CORBA.UNKNOWN(MinorCodes
- .describeUnknown(MinorCodes.MinorUnknownUserException)
- + ": " + id, MinorCodes.MinorUnknownUserException,
+ setSystemException(new org.omg.CORBA.UNKNOWN(org.apache.yoko.orb.OB.MinorCodes
+ .describeUnknown(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException,
org.omg.CORBA.CompletionStatus.COMPLETED_YES));
exId_ = id;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ProtocolPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ProtocolPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ProtocolPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ProtocolPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static ProtocolPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, ProtocolPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static ProtocolPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RequestTimeoutPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RequestTimeoutPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RequestTimeoutPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RequestTimeoutPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static RequestTimeoutPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, RequestTimeoutPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static RequestTimeoutPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryAttributesHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryAttributesHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryAttributesHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryAttributesHelper.java Fri Jul 6 03:52:10 2007
@@ -36,7 +36,11 @@
if(any.type().equivalent(type()))
return read(any.create_input_stream());
else
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/RetryPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static RetryPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, RetryPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static RetryPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ThreadPoolIdHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ThreadPoolIdHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ThreadPoolIdHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ThreadPoolIdHelper.java Fri Jul 6 03:52:10 2007
@@ -36,7 +36,11 @@
if(any.type().equivalent(type()))
return read(any.create_input_stream());
else
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TimeoutPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TimeoutPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TimeoutPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TimeoutPolicyHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static TimeoutPolicy
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, TimeoutPolicy val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static TimeoutPolicy
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TypeCodeFactory.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TypeCodeFactory.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TypeCodeFactory.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/TypeCodeFactory.java Fri Jul 6 03:52:10 2007
@@ -190,37 +190,37 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int i = 0; i < members.length; i++) {
if (!checkName(members[i].name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(members[i].type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType)
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberType,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int j = i + 1; j < members.length; j++)
if (members[i].name.length() > 0
&& members[i].name.equalsIgnoreCase(members[j].name)) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -254,14 +254,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
org.omg.CORBA.TypeCode origDisc = TypeCode
@@ -282,23 +282,23 @@
default:
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidDiscriminatorType),
- MinorCodes.MinorInvalidDiscriminatorType,
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidDiscriminatorType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidDiscriminatorType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
for (int i = 0; i < members.length; i++) {
if (!checkName(members[i].name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(members[i].type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType)
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberType,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
org.omg.CORBA.TypeCode labelType = members[i].label.type();
org.omg.CORBA.TypeCode origLabelType = TypeCode
@@ -308,9 +308,9 @@
&& !origLabelType.equivalent(discriminator_type)) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorIncompatibleLabelType)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleLabelType)
+ ": " + members[i].name,
- MinorCodes.MinorIncompatibleLabelType,
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleLabelType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
for (int j = i + 1; j < members.length; j++) {
@@ -322,9 +322,9 @@
members[j].label)) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorDuplicateLabel)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorDuplicateLabel)
+ ": " + members[i].name,
- MinorCodes.MinorDuplicateLabel,
+ org.apache.yoko.orb.OB.MinorCodes.MinorDuplicateLabel,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -374,30 +374,30 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int i = 0; i < members.length; i++) {
if (!checkName(members[i]))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
- + ": " + members[i], MinorCodes.MinorInvalidMemberName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ + ": " + members[i], org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int j = i + 1; j < members.length; j++)
if (members[i].length() > 0
&& members[i].equalsIgnoreCase(members[j])) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i],
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -420,19 +420,19 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(original_type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType),
- MinorCodes.MinorInvalidMemberType,
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -456,37 +456,37 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int i = 0; i < members.length; i++) {
if (!checkName(members[i].name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(members[i].type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType)
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberType,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int j = i + 1; j < members.length; j++)
if (members[i].name.length() > 0
&& members[i].name.equalsIgnoreCase(members[j].name)) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -519,14 +519,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -577,9 +577,9 @@
Assert._OB_assert(bound >= 0);
if (!checkType(element_type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType),
- MinorCodes.MinorInvalidMemberType,
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -605,9 +605,9 @@
Assert._OB_assert(length > 0);
if (!checkType(element_type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType),
- MinorCodes.MinorInvalidMemberType,
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -629,14 +629,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (concrete_base != null) {
try {
@@ -652,25 +652,25 @@
for (int i = 0; i < members.length; i++) {
if (!checkName(members[i].name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(members[i].type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType)
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberType,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
for (int j = i + 1; j < members.length; j++)
if (members[i].name.length() > 0
&& members[i].name.equalsIgnoreCase(members[j].name)) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidMemberName)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName)
+ ": " + members[i].name,
- MinorCodes.MinorInvalidMemberName,
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -714,19 +714,19 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkType(boxed_type))
- throw new org.omg.CORBA.BAD_TYPECODE(MinorCodes
- .describeBadTypecode(MinorCodes.MinorInvalidMemberType),
- MinorCodes.MinorInvalidMemberType,
+ throw new org.omg.CORBA.BAD_TYPECODE(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadTypecode(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidMemberType,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -747,14 +747,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -770,9 +770,9 @@
Assert._OB_assert(id != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -787,14 +787,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
@@ -811,14 +811,14 @@
Assert._OB_assert(id != null && name != null);
if (!checkId(id))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidId)
- + ": " + id, MinorCodes.MinorInvalidId,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId)
+ + ": " + id, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidId,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (!checkName(name))
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorInvalidName)
- + ": " + name, MinorCodes.MinorInvalidName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName)
+ + ": " + name, org.apache.yoko.orb.OB.MinorCodes.MinorInvalidName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
TypeCode tc = new TypeCode();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static URLRegistry
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, URLRegistry val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static URLRegistry
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryPackage/SchemeAlreadyExistsHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryPackage/SchemeAlreadyExistsHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryPackage/SchemeAlreadyExistsHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistryPackage/SchemeAlreadyExistsHelper.java Fri Jul 6 03:52:10 2007
@@ -36,7 +36,11 @@
if(any.type().equivalent(type()))
return read(any.create_input_stream());
else
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -64,8 +68,13 @@
public static SchemeAlreadyExists
read(org.omg.CORBA.portable.InputStream in)
{
- if(!id().equals(in.read_string()))
- throw new org.omg.CORBA.MARSHAL();
+ if(!id().equals(in.read_string())) {
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadIDMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadIDMismatch,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
SchemeAlreadyExists _ob_v = new SchemeAlreadyExists();
return _ob_v;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistry_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistry_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistry_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLRegistry_impl.java Fri Jul 6 03:52:10 2007
@@ -53,17 +53,17 @@
int colon = url.indexOf(':');
if (colon <= 0)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeName),
- MinorCodes.MinorBadSchemeName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeName),
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String name = url.substring(0, colon).toLowerCase();
URLScheme scheme = find_scheme(name);
if (scheme == null)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeName),
- MinorCodes.MinorBadSchemeName,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeName),
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeName,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String urlCopy = name + url.substring(colon);
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLSchemeHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLSchemeHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLSchemeHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLSchemeHelper.java Fri Jul 6 03:52:10 2007
@@ -34,7 +34,11 @@
if(any.type().equivalent(type()))
return narrow(any.extract_Object());
- throw new org.omg.CORBA.BAD_OPERATION();
+
+ throw new org.omg.CORBA.BAD_OPERATION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeBadOperation(org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch),
+ org.apache.yoko.orb.OB.MinorCodes.MinorTypeMismatch, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private static org.omg.CORBA.TypeCode typeCode_;
@@ -60,13 +64,21 @@
public static URLScheme
read(org.omg.CORBA.portable.InputStream in)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorReadUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static void
write(org.omg.CORBA.portable.OutputStream out, URLScheme val)
{
- throw new org.omg.CORBA.MARSHAL();
+ throw new org.omg.CORBA.MARSHAL(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeMarshal(org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWriteUnsupported,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public static URLScheme
@@ -80,6 +92,9 @@
{
}
- throw new org.omg.CORBA.BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType),
+ org.apache.yoko.orb.OB.MinorCodes.MinorIncompatibleObjectType,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLUtil.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLUtil.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLUtil.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/URLUtil.java Fri Jul 6 03:52:10 2007
@@ -35,20 +35,20 @@
//
if (ch == '%') {
if (pos + 2 >= len)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadAddress)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress)
+ ": bad escape sequence length",
- MinorCodes.MinorBadAddress,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
int c1 = Character.digit(str.charAt(++pos), 16);
int c2 = Character.digit(str.charAt(++pos), 16);
if (c1 == -1 || c2 == -1)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorOther)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorOther)
+ ": escape sequence contains invalid characters",
- MinorCodes.MinorOther,
+ org.apache.yoko.orb.OB.MinorCodes.MinorOther,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
ch = (char) ((c1 << 4) | c2);
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/UTF8Reader.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/UTF8Reader.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/UTF8Reader.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/UTF8Reader.java Fri Jul 6 03:52:10 2007
@@ -16,6 +16,7 @@
*/
package org.apache.yoko.orb.OB;
+import org.omg.CORBA.DATA_CONVERSION;
final class UTF8Reader extends CodeSetReader {
public char read_char(org.apache.yoko.orb.CORBA.InputStream in)
@@ -36,7 +37,11 @@
else if ((first & 0xf8) == 0xe0)
return 3;
- throw new org.omg.CORBA.DATA_CONVERSION();
+ throw new org.omg.CORBA.DATA_CONVERSION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeDataConversion(org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Overflow),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Overflow,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
private char utf8ToUnicode(org.apache.yoko.orb.CORBA.InputStream in)
@@ -58,8 +63,13 @@
// 4 free bits
value = (char) (first & 0x0f);
- if ((in.buf_.data_[in.buf_.pos_] & 0xc0) != 0x80)
- throw new org.omg.CORBA.DATA_CONVERSION();
+ if ((in.buf_.data_[in.buf_.pos_] & 0xc0) != 0x80) {
+ throw new org.omg.CORBA.DATA_CONVERSION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeDataConversion(org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Encoding),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Encoding,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
value <<= 6;
value |= in.buf_.data_[in.buf_.pos_++] & 0x3f;
@@ -67,11 +77,21 @@
//
// 16 bit overflow
//
- else
- throw new org.omg.CORBA.DATA_CONVERSION();
+ else {
+ throw new org.omg.CORBA.DATA_CONVERSION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeDataConversion(org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Overflow),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Overflow,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
- if ((in.buf_.data_[in.buf_.pos_] & 0xc0) != 0x80)
- throw new org.omg.CORBA.DATA_CONVERSION();
+ if ((in.buf_.data_[in.buf_.pos_] & 0xc0) != 0x80) {
+ throw new org.omg.CORBA.DATA_CONVERSION(
+ org.apache.yoko.orb.OB.MinorCodes
+ .describeDataConversion(org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Encoding),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUTF8Encoding,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ }
value <<= 6;
value |= in.buf_.data_[in.buf_.pos_++] & 0x3f;