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 [2/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/BootManagerHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerHelper.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 BootManager
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, BootManager 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 BootManager
@@ -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/BootManagerPackage/AlreadyExistsHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/AlreadyExistsHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/AlreadyExistsHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/AlreadyExistsHelper.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 AlreadyExists
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);
+ }
AlreadyExists _ob_v = new AlreadyExists();
return _ob_v;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/NotFoundHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/NotFoundHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/NotFoundHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/BootManagerPackage/NotFoundHelper.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 NotFound
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);
+ }
NotFound _ob_v = new NotFound();
return _ob_v;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CallStackHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CallStackHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CallStackHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CallStackHelper.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/ClientManager.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ClientManager.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ClientManager.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ClientManager.java Fri Jul 6 03:52:10 2007
@@ -123,9 +123,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);
//
@@ -383,10 +383,10 @@
// TRANSIENT exception
//
if (pairs.isEmpty())
- throw new org.omg.CORBA.TRANSIENT(MinorCodes
- .describeTransient(MinorCodes.MinorNoUsableProfileInIOR)
+ throw new org.omg.CORBA.TRANSIENT(org.apache.yoko.orb.OB.MinorCodes
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorNoUsableProfileInIOR)
+ "Unable to create client",
- MinorCodes.MinorNoUsableProfileInIOR,
+ org.apache.yoko.orb.OB.MinorCodes.MinorNoUsableProfileInIOR,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
@@ -417,8 +417,8 @@
//
// if(destroy_)
// throw new org.omg.CORBA.INITIALIZE(
- // MinorCodes.describeInitialize(MinorCodes.MinorORBDestroyed),
- // MinorCodes.MinorORBDestroyed,
+ // 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);
boolean inUse = client.decUsage();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeBaseProxy.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeBaseProxy.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeBaseProxy.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeBaseProxy.java Fri Jul 6 03:52:10 2007
@@ -36,8 +36,10 @@
CodeBaseProxy(ORBInstance orb, ServiceContext ctx) {
if (ctx.context_id != org.omg.IOP.SendingContextRunTime.value) {
- // TODO: add minor code?
- throw new BAD_PARAM();
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorInvalidContextID),
+ org.apache.yoko.orb.OB.MinorCodes.MinorInvalidContextID,
+ org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
this.orbInstance_ = orb;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeConverterNone.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeConverterNone.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeConverterNone.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CodeConverterNone.java Fri Jul 6 03:52:10 2007
@@ -35,37 +35,37 @@
}
public char read_wchar(org.apache.yoko.orb.CORBA.InputStream in, int len) {
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorNoWcharCodeSet),
- MinorCodes.MinorNoWcharCodeSet,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorNoWcharCodeSet),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNoWcharCodeSet,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public void write_wchar(org.apache.yoko.orb.CORBA.OutputStream out, char v) {
- throw new org.omg.CORBA.INV_OBJREF(MinorCodes
- .describeInvObjref(MinorCodes.MinorWcharCodeSetRequired),
- MinorCodes.MinorWcharCodeSetRequired,
+ throw new org.omg.CORBA.INV_OBJREF(org.apache.yoko.orb.OB.MinorCodes
+ .describeInvObjref(org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public int read_count_wchar(char value) {
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorNoWcharCodeSet),
- MinorCodes.MinorNoWcharCodeSet,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorNoWcharCodeSet),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNoWcharCodeSet,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public int write_count_wchar(char v) {
- throw new org.omg.CORBA.INV_OBJREF(MinorCodes
- .describeInvObjref(MinorCodes.MinorWcharCodeSetRequired),
- MinorCodes.MinorWcharCodeSetRequired,
+ throw new org.omg.CORBA.INV_OBJREF(org.apache.yoko.orb.OB.MinorCodes
+ .describeInvObjref(org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
public char convert(char v) {
- throw new org.omg.CORBA.INV_OBJREF(MinorCodes
- .describeInvObjref(MinorCodes.MinorWcharCodeSetRequired),
- MinorCodes.MinorWcharCodeSetRequired,
+ throw new org.omg.CORBA.INV_OBJREF(org.apache.yoko.orb.OB.MinorCodes
+ .describeInvObjref(org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWcharCodeSetRequired,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CollocatedServer.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CollocatedServer.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CollocatedServer.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CollocatedServer.java Fri Jul 6 03:52:10 2007
@@ -90,7 +90,7 @@
Assert._OB_assert(down != null);
Assert._OB_assert(down.pending());
down.setFailureException(new org.omg.CORBA.INITIALIZE(
- "ORB has been destroyed", MinorCodes.MinorORBDestroyed,
+ "ORB has been destroyed", org.apache.yoko.orb.OB.MinorCodes.MinorORBDestroyed,
org.omg.CORBA.CompletionStatus.COMPLETED_NO));
}
callMap_.clear();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectTimeoutPolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectTimeoutPolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectTimeoutPolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectTimeoutPolicyHelper.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 ConnectTimeoutPolicy
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, ConnectTimeoutPolicy 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 ConnectTimeoutPolicy
@@ -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/ConnectionReusePolicyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectionReusePolicyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectionReusePolicyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ConnectionReusePolicyHelper.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 ConnectionReusePolicy
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, ConnectionReusePolicy 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 ConnectionReusePolicy
@@ -79,7 +91,10 @@
catch(ClassCastException ex)
{
}
-
- 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/CorbalocProtocolHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolHelper.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 CorbalocProtocol
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, CorbalocProtocol 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 CorbalocProtocol
@@ -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/CorbalocProtocolPackage/ObjectKeyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolPackage/ObjectKeyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolPackage/ObjectKeyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocProtocolPackage/ObjectKeyHelper.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/CorbalocURLSchemeHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemeHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemeHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemeHelper.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 CorbalocURLScheme
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, CorbalocURLScheme 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 CorbalocURLScheme
@@ -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/CorbalocURLSchemePackage/ProtocolAlreadyExistsHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemePackage/ProtocolAlreadyExistsHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemePackage/ProtocolAlreadyExistsHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLSchemePackage/ProtocolAlreadyExistsHelper.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 ProtocolAlreadyExists
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);
+ }
ProtocolAlreadyExists _ob_v = new ProtocolAlreadyExists();
return _ob_v;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLScheme_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLScheme_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLScheme_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbalocURLScheme_impl.java Fri Jul 6 03:52:10 2007
@@ -38,9 +38,9 @@
if (ch > 255)
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": invalid character in key",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
result[i] = (byte) ch;
@@ -59,16 +59,16 @@
if (comma != -1 && comma <= endIdx)
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": rir cannot be used with other protocols",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (startIdx + 3 != endIdx)
- 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)
+ ": rir does not allow an address",
- MinorCodes.MinorBadAddress,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
try {
@@ -78,9 +78,9 @@
} catch (org.omg.CORBA.ORBPackage.InvalidName ex) {
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": invalid initial reference token",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -105,9 +105,9 @@
if (colon == -1)
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": no protocol",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
else if (colon > endIdx)
break;
@@ -123,9 +123,9 @@
if (protocol.equals("rir"))
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": rir cannot be used with other protocols",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
@@ -160,10 +160,10 @@
}
if (profiles.size() == 0)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": no valid protocol addresses",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
org.omg.IOP.IOR ior = new org.omg.IOP.IOR();
@@ -202,17 +202,17 @@
// we consider this to be an invalid URL
//
if (slash == -1)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorOther)
- + ": no key specified", MinorCodes.MinorOther,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorOther)
+ + ": no key specified", org.apache.yoko.orb.OB.MinorCodes.MinorOther,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
int addrStart = 9; // skip "corbaloc:"
int addrEnd = slash - 1;
if (addrStart == slash)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadAddress)
- + ": no protocol address", MinorCodes.MinorBadAddress,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress)
+ + ": no protocol address", org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String key = url.substring(slash + 1);
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbanameURLScheme_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbanameURLScheme_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbanameURLScheme_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CorbanameURLScheme_impl.java Fri Jul 6 03:52:10 2007
@@ -79,9 +79,9 @@
int addrEnd;
if (addrStart == slash)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadAddress)
- + ": no protocol address", MinorCodes.MinorBadAddress,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress)
+ + ": no protocol address", org.apache.yoko.orb.OB.MinorCodes.MinorBadAddress,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
if (slash == -1 && fragmentStart == -1)
@@ -143,9 +143,9 @@
if (!parser.isValid())
throw new org.omg.CORBA.BAD_PARAM(
MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": invalid stringified name",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String[] content = parser.getContents();
@@ -217,9 +217,9 @@
// Fall through
}
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorOther)
- + ": corbaname evaluation error", MinorCodes.MinorOther,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorOther)
+ + ": corbaname evaluation error", org.apache.yoko.orb.OB.MinorCodes.MinorOther,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchRequestHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchRequestHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchRequestHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchRequestHelper.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 DispatchRequest
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, DispatchRequest 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 DispatchRequest
@@ -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/DispatchStrategyFactoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactoryHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactoryHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactoryHelper.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 DispatchStrategyFactory
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, DispatchStrategyFactory 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 DispatchStrategyFactory
@@ -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/DispatchStrategyFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java Fri Jul 6 03:52:10 2007
@@ -178,9 +178,9 @@
// error 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);
//
@@ -212,9 +212,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);
if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null)
@@ -238,9 +238,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);
if (id < 0 || id > pools_.size() || pools_.elementAt(id) == null)
@@ -256,9 +256,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);
return new DispatchSameThread_impl();
@@ -270,9 +270,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);
return new DispatchThreadPerRequest_impl();
@@ -284,9 +284,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);
//
@@ -357,9 +357,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);
destroy_ = true;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyHelper.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 DispatchStrategy
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, DispatchStrategy 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 DispatchStrategy
@@ -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/DispatchStrategyIdHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyIdHelper.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyIdHelper.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyIdHelper.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/Downcall.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Downcall.java Fri Jul 6 03:52:10 2007
@@ -374,9 +374,9 @@
//
if (state_ == DowncallStateUserException && ex_ == null
&& exId_ == null)
- setSystemException(new org.omg.CORBA.UNKNOWN(MinorCodes
- .describeUnknown(MinorCodes.MinorUnknownUserException),
- MinorCodes.MinorUnknownUserException,
+ setSystemException(new org.omg.CORBA.UNKNOWN(org.apache.yoko.orb.OB.MinorCodes
+ .describeUnknown(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownUserException,
org.omg.CORBA.CompletionStatus.COMPLETED_YES));
checkForException();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java Fri Jul 6 03:52:10 2007
@@ -85,9 +85,9 @@
.trace("retry", "no profiles available");
}
- throw new FailureException(new org.omg.CORBA.TRANSIENT(MinorCodes
- .describeTransient(MinorCodes.MinorNoUsableProfileInIOR),
- MinorCodes.MinorNoUsableProfileInIOR,
+ throw new FailureException(new org.omg.CORBA.TRANSIENT(org.apache.yoko.orb.OB.MinorCodes
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorNoUsableProfileInIOR),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNoUsableProfileInIOR,
org.omg.CORBA.CompletionStatus.COMPLETED_NO));
}
@@ -346,8 +346,8 @@
if (clientManager == null)
throw new org.omg.CORBA.BAD_INV_ORDER(
MinorCodes
- .describeBadInvOrder(MinorCodes.MinorShutdownCalled),
- MinorCodes.MinorShutdownCalled,
+ .describeBadInvOrder(org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled),
+ org.apache.yoko.orb.OB.MinorCodes.MinorShutdownCalled,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
clientManager.releaseClient(pair.client, false);
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/FileURLScheme_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/FileURLScheme_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/FileURLScheme_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/FileURLScheme_impl.java Fri Jul 6 03:52:10 2007
@@ -61,10 +61,10 @@
break;
if (startIdx >= len)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": no file name specified",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
String fileName;
@@ -84,9 +84,9 @@
return registry_.parse_url(ref);
} catch (java.io.IOException ex) {
System.err.println(ex);
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
- + ": file error", MinorCodes.MinorBadSchemeSpecificPart,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ + ": file error", org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPClient.java Fri Jul 6 03:52:10 2007
@@ -125,9 +125,9 @@
//
protected synchronized GIOPConnection getWorker(boolean create, int t) {
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/GIOPConnection.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java Fri Jul 6 03:52:10 2007
@@ -389,8 +389,8 @@
State.Error,
new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage),
- MinorCodes.MinorUnknownMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE),
false);
break;
@@ -406,8 +406,8 @@
if ((properties_ & Property.ServerEnabled) == 0) {
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorWrongMessage),
- MinorCodes.MinorWrongMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return null;
}
@@ -428,8 +428,8 @@
State.Error,
new org.omg.CORBA.NO_IMPLEMENT(
MinorCodes
- .describeNoImplement(MinorCodes.MinorNotSupportedByLocalObject),
- MinorCodes.MinorNotSupportedByLocalObject,
+ .describeNoImplement(org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject,
org.omg.CORBA.CompletionStatus.COMPLETED_NO),
false);
return null;
@@ -503,8 +503,8 @@
if ((properties_ & Property.ClientEnabled) == 0) {
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorWrongMessage),
- MinorCodes.MinorWrongMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -527,8 +527,8 @@
//
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownReqId)
- + ": " + reqId, MinorCodes.MinorUnknownReqId,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReqId)
+ + ": " + reqId, org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReqId,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -591,8 +591,8 @@
State.Error,
new org.omg.CORBA.NO_IMPLEMENT(
MinorCodes
- .describeNoImplement(MinorCodes.MinorNotSupportedByLocalObject),
- MinorCodes.MinorNotSupportedByLocalObject,
+ .describeNoImplement(org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject,
org.omg.CORBA.CompletionStatus.COMPLETED_NO), false);
break;
@@ -601,8 +601,8 @@
State.Error,
new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownReplyMessage),
- MinorCodes.MinorUnknownReplyMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReplyMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReplyMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE),
false);
break;
@@ -626,8 +626,8 @@
if ((properties_ & Property.ServerEnabled) == 0) {
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorWrongMessage),
- MinorCodes.MinorWrongMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -666,8 +666,8 @@
State.Error,
new org.omg.CORBA.NO_IMPLEMENT(
MinorCodes
- .describeNoImplement(MinorCodes.MinorNotSupportedByLocalObject),
- MinorCodes.MinorNotSupportedByLocalObject,
+ .describeNoImplement(org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject),
+ org.apache.yoko.orb.OB.MinorCodes.MinorNotSupportedByLocalObject,
org.omg.CORBA.CompletionStatus.COMPLETED_NO),
false);
return;
@@ -742,8 +742,8 @@
if ((properties_ & Property.ClientEnabled) == 0) {
processException(State.Closed, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorWrongMessage),
- MinorCodes.MinorWrongMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -765,8 +765,8 @@
//
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownReqId),
- MinorCodes.MinorUnknownReqId,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReqId),
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownReqId,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -778,8 +778,8 @@
if (!op.equals("_locate")) {
processException(State.Error, new org.omg.CORBA.COMM_FAILURE(
MinorCodes
- .describeCommFailure(MinorCodes.MinorWrongMessage),
- MinorCodes.MinorWrongMessage,
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage),
+ org.apache.yoko.orb.OB.MinorCodes.MinorWrongMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
return;
}
@@ -867,8 +867,8 @@
State.Closed,
new org.omg.CORBA.TRANSIENT(
MinorCodes
- .describeTransient(MinorCodes.MinorCloseConnection),
- MinorCodes.MinorCloseConnection,
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorCloseConnection),
+ org.apache.yoko.orb.OB.MinorCodes.MinorCloseConnection,
org.omg.CORBA.CompletionStatus.COMPLETED_NO), true);
} else {
setState(State.Closed);
@@ -879,9 +879,9 @@
// process a MessageError message
//
protected void processMessageError(GIOPIncomingMessage msg) {
- processException(State.Error, new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorMessageError),
- MinorCodes.MinorMessageError,
+ processException(State.Error, new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorMessageError),
+ org.apache.yoko.orb.OB.MinorCodes.MinorMessageError,
org.omg.CORBA.CompletionStatus.COMPLETED_NO), false);
}
@@ -1559,8 +1559,8 @@
else
processException(State.Closed, new org.omg.CORBA.TRANSIENT(
MinorCodes
- .describeTransient(MinorCodes.MinorForcedShutdown),
- MinorCodes.MinorForcedShutdown,
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown),
+ org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java Fri Jul 6 03:52:10 2007
@@ -220,9 +220,9 @@
// closes. Instead, we just close the connection, meaning that we
// can't be 100% sure that the peer gets the last message.
//
- processException(State.Closed, new org.omg.CORBA.TRANSIENT(MinorCodes
- .describeTransient(MinorCodes.MinorForcedShutdown),
- MinorCodes.MinorForcedShutdown,
+ processException(State.Closed, new org.omg.CORBA.TRANSIENT(org.apache.yoko.orb.OB.MinorCodes
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown),
+ org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
}
@@ -287,8 +287,8 @@
shutdownThread_.start();
} catch (OutOfMemoryError ex) {
processException(State.Closed, new org.omg.CORBA.IMP_LIMIT(
- MinorCodes.describeImpLimit(MinorCodes.MinorThreadLimit),
- MinorCodes.MinorThreadLimit,
+ org.apache.yoko.orb.OB.MinorCodes.describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_NO), false);
}
}
@@ -383,9 +383,9 @@
// thread may not have terminated yet or the receive thread might
// set the state to GIOPState::Error before termination.
//
- processException(State.Closed, new org.omg.CORBA.TRANSIENT(MinorCodes
- .describeTransient(MinorCodes.MinorForcedShutdown),
- MinorCodes.MinorForcedShutdown,
+ processException(State.Closed, new org.omg.CORBA.TRANSIENT(org.apache.yoko.orb.OB.MinorCodes
+ .describeTransient(org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown),
+ org.apache.yoko.orb.OB.MinorCodes.MinorForcedShutdown,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE), false);
}
@@ -767,9 +767,9 @@
synchronized (this) {
transport_.close();
state_ = State.Closed;
- throw new org.omg.CORBA.IMP_LIMIT(MinorCodes
- .describeImpLimit(MinorCodes.MinorThreadLimit),
- MinorCodes.MinorThreadLimit,
+ throw new org.omg.CORBA.IMP_LIMIT(org.apache.yoko.orb.OB.MinorCodes
+ .describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
@@ -851,9 +851,9 @@
// send fails
//
if (!buf.is_full())
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorSend),
- MinorCodes.MinorSend,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorSend),
+ org.apache.yoko.orb.OB.MinorCodes.MinorSend,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
//
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPIncomingMessage.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPIncomingMessage.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPIncomingMessage.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPIncomingMessage.java Fri Jul 6 03:52:10 2007
@@ -60,9 +60,9 @@
orbInstance_.getLogger().warning(msg);
- throw new org.omg.CORBA.IMP_LIMIT(MinorCodes
- .describeImpLimit(MinorCodes.MinorMessageSizeLimit),
- MinorCodes.MinorMessageSizeLimit,
+ throw new org.omg.CORBA.IMP_LIMIT(org.apache.yoko.orb.OB.MinorCodes
+ .describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
buf.realloc(len + b.rest_length());
@@ -168,9 +168,9 @@
}
default:
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorNoGIOP)
- + ": invalid target address", MinorCodes.MinorNoGIOP,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorNoGIOP)
+ + ": invalid target address", org.apache.yoko.orb.OB.MinorCodes.MinorNoGIOP,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
}
@@ -214,9 +214,9 @@
byte[] pos = buf.data();
if (pos[0] != (byte) 'G' || pos[1] != (byte) 'I'
|| pos[2] != (byte) 'O' || pos[3] != (byte) 'P') {
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorNoGIOP)
- + ": missing GIOP magic key", MinorCodes.MinorNoGIOP,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorNoGIOP)
+ + ": missing GIOP magic key", org.apache.yoko.orb.OB.MinorCodes.MinorNoGIOP,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
}
@@ -227,9 +227,9 @@
version_.minor = pos[5];
if (version_.major != 1 || version_.minor > 2)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorVersion),
- MinorCodes.MinorVersion,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorVersion),
+ org.apache.yoko.orb.OB.MinorCodes.MinorVersion,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
org.apache.yoko.orb.CORBA.InputStream in = new org.apache.yoko.orb.CORBA.InputStream(
@@ -245,10 +245,10 @@
size_ = in.read_ulong();
if (type_.value() > org.omg.GIOP.MsgType_1_1._MessageError)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid message type for GIOP 1.0",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
break;
@@ -265,10 +265,10 @@
size_ = in.read_ulong();
if (type_.value() > org.omg.GIOP.MsgType_1_1._Fragment)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid message type for GIOP 1.1/1.2",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
break;
@@ -283,9 +283,9 @@
+ ") exceeds maximum (" + maxMessageSize_ + ")";
orbInstance_.getLogger().warning(msg);
- throw new org.omg.CORBA.IMP_LIMIT(MinorCodes
- .describeImpLimit(MinorCodes.MinorMessageSizeLimit),
- MinorCodes.MinorMessageSizeLimit,
+ throw new org.omg.CORBA.IMP_LIMIT(org.apache.yoko.orb.OB.MinorCodes
+ .describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
}
@@ -297,10 +297,10 @@
// evenly divisible by 8.
//
if (version_.minor == 2 && fragment_ && (size_ + 12) % 8 != 0)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment)
+ ": invalid GIOP 1.2 fragment size",
- MinorCodes.MinorFragment,
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
}
@@ -315,9 +315,9 @@
//
if (fragment_ && type_ != org.omg.GIOP.MsgType_1_1.Fragment) {
if (version_.minor < 1) {
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment),
- MinorCodes.MinorFragment,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment),
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
} else if (version_.minor == 1) {
//
@@ -326,9 +326,9 @@
//
if (type_ != org.omg.GIOP.MsgType_1_1.Request
&& type_ != org.omg.GIOP.MsgType_1_1.Reply)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment),
- MinorCodes.MinorFragment,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment),
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
//
@@ -374,9 +374,9 @@
&& type_ != org.omg.GIOP.MsgType_1_1.Reply
&& type_ != org.omg.GIOP.MsgType_1_1.LocateRequest
&& type_ != org.omg.GIOP.MsgType_1_1.LocateReply) {
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment),
- MinorCodes.MinorFragment,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment),
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
}
@@ -423,9 +423,9 @@
//
// Fragment not supported in GIOP 1.0
//
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment),
- MinorCodes.MinorFragment,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment),
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
} else if (version_.minor == 1) {
//
@@ -433,9 +433,9 @@
// without an initial message
//
if (lastFragment_ == null)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorFragment),
- MinorCodes.MinorFragment,
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorFragment),
+ org.apache.yoko.orb.OB.MinorCodes.MinorFragment,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
//
@@ -712,10 +712,10 @@
status.value = org.omg.GIOP.ReplyStatusType_1_2.from_int(in_
.read_ulong());
if (status.value.value() > org.omg.GIOP.ReplyStatusType_1_2._LOCATION_FORWARD)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid reply status",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
break;
@@ -727,10 +727,10 @@
status.value = org.omg.GIOP.ReplyStatusType_1_2.from_int(in_
.read_ulong());
if (status.value.value() > org.omg.GIOP.ReplyStatusType_1_2._NEEDS_ADDRESSING_MODE)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid reply status",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
readServiceContextList(scl); // service_context
@@ -810,10 +810,10 @@
status.value = org.omg.GIOP.LocateStatusType_1_2.from_int(in_
.read_ulong());
if (status.value.value() > org.omg.GIOP.LocateStatusType_1_2._OBJECT_FORWARD)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid locate reply status",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
break;
@@ -826,10 +826,10 @@
status.value = org.omg.GIOP.LocateStatusType_1_2.from_int(in_
.read_ulong());
if (status.value.value() > org.omg.GIOP.LocateStatusType_1_2._LOC_NEEDS_ADDRESSING_MODE)
- throw new org.omg.CORBA.COMM_FAILURE(MinorCodes
- .describeCommFailure(MinorCodes.MinorUnknownMessage)
+ throw new org.omg.CORBA.COMM_FAILURE(org.apache.yoko.orb.OB.MinorCodes
+ .describeCommFailure(org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage)
+ ": invalid locate reply status",
- MinorCodes.MinorUnknownMessage,
+ org.apache.yoko.orb.OB.MinorCodes.MinorUnknownMessage,
org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE);
//
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPOutgoingMessage.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPOutgoingMessage.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPOutgoingMessage.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPOutgoingMessage.java Fri Jul 6 03:52:10 2007
@@ -106,9 +106,9 @@
+ ") exceeds maximum (" + maxMessageSize_ + ")";
orbInstance_.getLogger().warning(msg);
- throw new org.omg.CORBA.IMP_LIMIT(MinorCodes
- .describeImpLimit(MinorCodes.MinorMessageSizeLimit),
- MinorCodes.MinorMessageSizeLimit,
+ throw new org.omg.CORBA.IMP_LIMIT(org.apache.yoko.orb.OB.MinorCodes
+ .describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorMessageSizeLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java Fri Jul 6 03:52:10 2007
@@ -107,9 +107,9 @@
} catch (OutOfMemoryError ex) {
acceptor_.close();
state_ = StateClosed;
- throw new org.omg.CORBA.IMP_LIMIT(MinorCodes
- .describeImpLimit(MinorCodes.MinorThreadLimit),
- MinorCodes.MinorThreadLimit,
+ throw new org.omg.CORBA.IMP_LIMIT(org.apache.yoko.orb.OB.MinorCodes
+ .describeImpLimit(org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit),
+ org.apache.yoko.orb.OB.MinorCodes.MinorThreadLimit,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/IORURLScheme_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/IORURLScheme_impl.java?view=diff&rev=553831&r1=553830&r2=553831
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/IORURLScheme_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/IORURLScheme_impl.java Fri Jul 6 03:52:10 2007
@@ -43,10 +43,10 @@
int len = url.length() - 4; // skip "IOR:"
if ((len % 2) != 0)
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ ": invalid length",
- MinorCodes.MinorBadSchemeSpecificPart,
+ org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
byte[] data = HexConverter.asciiToOctets(url, 4);
@@ -70,9 +70,9 @@
//
// In this case, a marshal error is really a bad "IOR:..." string
//
- throw new org.omg.CORBA.BAD_PARAM(MinorCodes
- .describeBadParam(MinorCodes.MinorBadSchemeSpecificPart)
- + ": invalid IOR", MinorCodes.MinorBadSchemeSpecificPart,
+ throw new org.omg.CORBA.BAD_PARAM(org.apache.yoko.orb.OB.MinorCodes
+ .describeBadParam(org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart)
+ + ": invalid IOR", org.apache.yoko.orb.OB.MinorCodes.MinorBadSchemeSpecificPart,
org.omg.CORBA.CompletionStatus.COMPLETED_NO);
}
}