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/12 18:36:21 UTC
svn commit: r555715 [1/4] - in /incubator/yoko/trunk:
core/src/main/java/org/apache/yoko/orb/CORBA/
core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/
core/src/main/java/org/apache/yoko/orb/DynamicAny/
core/src/main/java/org/apache/yoko/orb/IMR/...
Author: rickmcguire
Date: Thu Jul 12 11:36:16 2007
New Revision: 555715
URL: http://svn.apache.org/viewvc?view=rev&rev=555715
Log:
YOKO-401 Do a better job of logging errors and propogating initCause() exceptions.
Modified:
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Any.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Context.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/InputStream.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ObjectImpl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/OutputStream.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Request.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ServerRequest.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynAny_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynEnum_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynFixed_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueBox_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueReader.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ActiveStateStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_DomainStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerDomainStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerFactoryStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IOP/CDRCodec.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OAD/_ProcessEndpointManagerStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OAD/_ProcessEndpointStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Assert.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/AssertionFailed.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/CollocatedServer.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DispatchStrategyFactory_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/DowncallStub.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/FileURLScheme_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnection.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPConnectionThreaded.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/IORDump.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/InitialServiceManager.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerOperations.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/MessageRoutingUtil.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ORBControl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PIManager.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/PluginManager.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ThreadPool.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Upcall.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Util.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueWriter.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/WLoggerOperations.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBCORBA/ORB_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBMessaging/ExceptionHolder_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBMessaging/UserExceptionRaiseProxy.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableInterceptor/ORBInitInfo_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/DefaultServantHolder.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAManagerFactory_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POAOAInterface_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OBPortableServer/POA_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Acceptor_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/ConnectorInfo_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Connector_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Plugin_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OCI/IIOP/Transport_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/PortableInterceptor/ArgumentStrategyDII.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/PortableInterceptor/IMRIORInterceptor_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/PortableServer/Current_impl.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/PortableServer/Delegate.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/csi/CSIInterceptorBase.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/csi/CSIInterceptorLoader.java
incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/csi/CSIServerRequestInterceptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/api/PortableRemoteObjectExt.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ArrayDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ClassDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/CopyState.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/CorbaObjectWriter.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/FieldDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/IDLEntityDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/IOR.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/PortableRemoteObjectImpl.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIInitializer.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIInterceptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIPersistentStub.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIServant.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIState.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RMIStubHandler.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/RemoteDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/StubImpl.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/TypeRepository.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/UtilImpl.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueDescriptor.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/impl/ValueHandlerImpl.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/util/corba/Field.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/util/corba/POAObject.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/util/stub/BCELClassBuilder.java
incubator/yoko/trunk/rmi-impl/src/main/java/org/apache/yoko/rmi/util/stub/Util.java
incubator/yoko/trunk/rmi-spec/src/main/java/javax/rmi/CORBA/Stub.java
incubator/yoko/trunk/rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java
incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/CORBA/ORB.java
incubator/yoko/trunk/yoko-spec-corba/src/main/java/org/omg/PortableServer/Servant.java
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Any.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Any.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Any.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Any.java Thu Jul 12 11:36:16 2007
@@ -202,7 +202,7 @@
org.omg.CORBA_2_3.portable.InputStream is = (org.omg.CORBA_2_3.portable.InputStream) in;
value_ = is.read_value(type_.id());
} catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(e);
}
}
break;
@@ -224,7 +224,7 @@
CompletionStatus.COMPLETED_NO);
value_ = str;
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
break;
}
@@ -241,7 +241,7 @@
CompletionStatus.COMPLETED_NO);
value_ = str;
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
break;
}
@@ -250,7 +250,7 @@
try {
value_ = in.read_fixed().movePointLeft(origType_.fixed_scale());
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
break;
@@ -627,7 +627,7 @@
out.write_fixed(((java.math.BigDecimal) value_)
.movePointRight(origType_.fixed_scale()));
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
break;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Context.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Context.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Context.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Context.java Thu Jul 12 11:36:16 2007
@@ -93,7 +93,7 @@
try {
nv = values.item(i);
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
String s = null;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java Thu Jul 12 11:36:16 2007
@@ -16,6 +16,8 @@
*/
package org.apache.yoko.orb.CORBA;
+import java.util.logging.Level;
+
import org.omg.CORBA.INV_POLICY;
//
@@ -128,13 +130,14 @@
} catch (org.omg.CORBA.TRANSIENT e) {
} catch (org.omg.CORBA.NO_RESPONSE e) {
} catch (org.omg.CORBA.SystemException e) {
+ org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
+ logger.log(java.util.logging.Level.FINE, "System exception during operation", ex);
if (coreTraceLevels.traceRetry() > 0) {
String msg = "retry only upon COMM_FAILURE, TRANSIENT "
+ "and NO_RESPONSE exceptions";
String exMsg = ex.getMessage();
if (exMsg != null)
msg += "\n" + exMsg;
- org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
logger.trace("retry", msg);
}
throw ex;
@@ -274,7 +277,7 @@
.read(in);
return def;
} catch (org.omg.CORBA.portable.ApplicationException ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.portable.RemarshalException ex) {
// do nothing - continue loop
} finally {
@@ -349,7 +352,7 @@
in = invoke(self, out);
return in.read_boolean();
} catch (org.omg.CORBA.portable.ApplicationException ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.portable.RemarshalException ex) {
// do nothing - continue loop
} finally {
@@ -380,7 +383,7 @@
in = invoke(self, out);
return in.read_boolean();
} catch (org.omg.CORBA.portable.ApplicationException ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.portable.RemarshalException ex) {
// do nothing - continue loop
} finally {
@@ -537,6 +540,8 @@
obout);
return in;
} catch (org.omg.CORBA.portable.ApplicationException ex) {
+ org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
+ logger.log(java.util.logging.Level.FINE, "Received ApplicationException for request", ex);
throw ex;
} catch (org.omg.CORBA.portable.RemarshalException ex) {
// fall through
@@ -895,6 +900,8 @@
void _OB_handleException(org.omg.CORBA.Object self, Exception ex,
RetryInfo info, boolean ignoreRebind, boolean useTSS) {
+
+ org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
try {
throw ex;
} catch (org.apache.yoko.orb.OB.LocationForward e) {
@@ -911,8 +918,6 @@
if (policies_.rebindMode == org.omg.Messaging.NO_RECONNECT.value
&& !ignoreRebind) {
if (coreTraceLevels.traceRetry() > 0) {
- org.apache.yoko.orb.OB.Logger logger = orbInstance_
- .getLogger();
logger.trace("retry", "can't try again, because "
+ "NO_RECONNECT prevents a transparent "
+ "location forward");
@@ -929,8 +934,6 @@
info.hop++;
if (info.hop > 10) {
if (coreTraceLevels.traceRetry() > 0) {
- org.apache.yoko.orb.OB.Logger logger = orbInstance_
- .getLogger();
logger.trace("retry",
"location forward hop count exceeded");
}
@@ -961,8 +964,6 @@
checkLocal_ = true;
if (coreTraceLevels.traceRetry() > 0) {
- org.apache.yoko.orb.OB.Logger logger = orbInstance_
- .getLogger();
logger.trace("retry", "trying again because of location "
+ "forward");
}
@@ -986,7 +987,6 @@
String exMsg = e.exception.getMessage();
if (exMsg != null)
msg += "\n" + exMsg;
- org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
logger.trace("retry", msg);
}
@@ -1008,21 +1008,22 @@
String exMsg = e.getMessage();
if (exMsg != null)
msg += "\n" + exMsg;
- org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
logger.trace("retry", msg);
}
if (useTSS)
setRetry(info);
} catch (org.omg.CORBA.SystemException e) {
+ logger.log(java.util.logging.Level.FINE, "Received SystemException", e);
throw e;
} catch (org.omg.CORBA.UserException e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false); // should never
+ org.apache.yoko.orb.OB.Assert._OB_assert(e); // should never
// happen
} catch (java.lang.RuntimeException e) {
+ logger.log(java.util.logging.Level.FINE, "Received RuntimeException", e);
throw e;
} catch (java.lang.Exception e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false); // should never
+ org.apache.yoko.orb.OB.Assert._OB_assert(e); // should never
// happen
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/InputStream.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/InputStream.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/InputStream.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/InputStream.java Thu Jul 12 11:36:16 2007
@@ -17,6 +17,8 @@
package org.apache.yoko.orb.CORBA;
+import java.util.logging.Level;
+
import javax.rmi.CORBA.Util;
import org.omg.SendingContext.CodeBase;
@@ -1682,6 +1684,8 @@
//
org.omg.CORBA.Object obj = read_Object();
+ org.apache.yoko.orb.OB.Logger logger = orbInstance_.getLogger();
+
if (obj != null) {
// OK, we have two possibilities here. The usual possibility is we're asked to load
// an object using a specified Stub class. We just create an instance of the stub class,
@@ -1700,7 +1704,9 @@
stubImpl._set_delegate(impl._get_delegate());
return stubImpl;
} catch (IllegalAccessException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
} catch (InstantiationException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
}
throw new org.omg.CORBA.MARSHAL("Unable to create stub for class " + clz.getName(),
org.apache.yoko.orb.OB.MinorCodes.MinorLoadStub,
@@ -1715,9 +1721,13 @@
stubImpl._set_delegate(impl._get_delegate());
return stubImpl;
} catch (IllegalAccessException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
} catch (InstantiationException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
} catch (ClassNotFoundException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
} catch (ClassCastException ex) {
+ logger.log(java.util.logging.Level.FINE, "Exception creating object stub", ex);
}
throw new org.omg.CORBA.MARSHAL("Unable to create stub for class " + clz.getName(),
org.apache.yoko.orb.OB.MinorCodes.MinorLoadStub,
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ObjectImpl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ObjectImpl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ObjectImpl.java Thu Jul 12 11:36:16 2007
@@ -216,13 +216,13 @@
//
return null;
} catch (NoSuchMethodException e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(e);
} catch (IllegalAccessException e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(e);
} catch (IllegalArgumentException e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(e);
} catch (java.lang.reflect.InvocationTargetException e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(e);
} catch (SecurityException e) {
//
// REVISIT:
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/OutputStream.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/OutputStream.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/OutputStream.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/OutputStream.java Thu Jul 12 11:36:16 2007
@@ -367,9 +367,9 @@
org.apache.yoko.orb.OB.Assert._OB_assert(false);
}
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
}
@@ -1215,7 +1215,7 @@
String pattern = contexts.item(i);
ctxImpl._OB_getValues("", 0, pattern, v);
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -1798,9 +1798,9 @@
org.apache.yoko.orb.OB.Assert._OB_assert(false);
}
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Request.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Request.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Request.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/Request.java Thu Jul 12 11:36:16 2007
@@ -16,6 +16,9 @@
*/
package org.apache.yoko.orb.CORBA;
+import java.util.logging.Level;
+
+import org.apache.yoko.orb.OB.Logger;
//
// This class must be public - see org.apache.yoko.orb.OB.MutliRequestSender
@@ -103,7 +106,7 @@
out.write_string((String) ctxVec.elementAt(i));
}
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.SystemException ex) {
downcallStub_.marshalEx(downcall_, ex);
}
@@ -148,9 +151,9 @@
}
}
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.SystemException ex) {
downcallStub_.unmarshalEx(downcall_, ex);
}
@@ -173,7 +176,7 @@
}
}
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
} catch (org.omg.CORBA.SystemException ex) {
downcallStub_.unmarshalEx(downcall_, ex);
@@ -363,6 +366,8 @@
}
} // while(true)
} catch (org.omg.CORBA.SystemException ex) {
+ Logger logger = delegate_._OB_ORBInstance().getLogger();
+ logger.log(java.util.logging.Level.FINE, "Exception sending request", ex);
environment_.exception(ex);
synchronized (stateMutex_) {
state_ = RequestStateDone;
@@ -428,6 +433,8 @@
}
} // while(true)
} catch (org.omg.CORBA.SystemException ex) {
+ Logger logger = delegate_._OB_ORBInstance().getLogger();
+ logger.log(java.util.logging.Level.FINE, "Exception sending deferred request", ex);
environment_.exception(ex);
synchronized (stateMutex_) {
multi.addDeferredRequest(this);
@@ -540,6 +547,8 @@
}
} // while(true)
} catch (org.omg.CORBA.SystemException ex) {
+ Logger logger = delegate_._OB_ORBInstance().getLogger();
+ logger.log(java.util.logging.Level.FINE, "Exception getting request response", ex);
environment_.exception(ex);
synchronized (stateMutex_) {
state_ = RequestStateDone;
@@ -637,6 +646,8 @@
}
} // while(true)
} catch (org.omg.CORBA.SystemException ex) {
+ Logger logger = delegate_._OB_ORBInstance().getLogger();
+ logger.log(java.util.logging.Level.FINE, "Exception polling request response", ex);
environment_.exception(ex);
synchronized (stateMutex_) {
state_ = RequestStateReceived;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ServerRequest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ServerRequest.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ServerRequest.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/ServerRequest.java Thu Jul 12 11:36:16 2007
@@ -61,7 +61,7 @@
nv.value().read_value(in_, nv.value().type());
}
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.SystemException ex) {
delegate_._OB_unmarshalEx(servant_, up_, ex);
}
@@ -188,7 +188,7 @@
try {
id = tc.id();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
if (org.apache.yoko.orb.OB.Util.isSystemException(id)) {
@@ -217,7 +217,7 @@
}
}
} catch (org.omg.CORBA.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
} catch (org.omg.CORBA.SystemException ex) {
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CORBA/TypeCode.java Thu Jul 12 11:36:16 2007
@@ -992,7 +992,7 @@
while (tc.kind() == org.omg.CORBA.TCKind.tk_alias)
tc = tc.content_type();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return tc;
@@ -1185,9 +1185,9 @@
org.apache.yoko.orb.OB.Assert._OB_assert(false);
}
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNameService.java Thu Jul 12 11:36:16 2007
@@ -152,7 +152,6 @@
// now register this as the naming service for the ORB as well.
((org.apache.yoko.orb.CORBA.ORB)orb).register_initial_reference("NameService", initialContext.getRootContext());
} catch (Exception e) {
- e.printStackTrace();
throw new TransientServiceException("Unable to initialize name service", e);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynAny_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynAny_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynAny_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynAny_impl.java Thu Jul 12 11:36:16 2007
@@ -22,6 +22,7 @@
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.CORBA.TypeCode;
import org.omg.CORBA.CustomMarshal;
+import org.omg.DynamicAny.DynAnyPackage.TypeMismatch;
abstract class DynAny_impl extends org.omg.CORBA.LocalObject implements
org.omg.DynamicAny.DynAny {
@@ -69,7 +70,7 @@
try {
result = factory_.create_dyn_any(any);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
if (adopt)
@@ -83,7 +84,7 @@
try {
result = factory_.create_dyn_any_from_type_code(tc);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
if (adopt)
@@ -108,7 +109,7 @@
result = factory_impl.prepare_dyn_any_from_type_code(tc,
dynValueReader);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
if (adopt)
@@ -295,7 +296,7 @@
if (len > 0 && value.length() > len)
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
any.replace(tc, value);
@@ -396,7 +397,7 @@
if (len > 0 && value.length() > len)
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
any.replace(tc, value);
@@ -483,7 +484,7 @@
throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
}
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
//
@@ -676,7 +677,8 @@
try {
return any.extract_boolean();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -691,7 +693,8 @@
try {
return any.extract_octet();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -706,7 +709,8 @@
try {
return any.extract_char();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -721,7 +725,8 @@
try {
return any.extract_short();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -736,7 +741,8 @@
try {
return any.extract_ushort();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -751,7 +757,8 @@
try {
return any.extract_long();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -766,7 +773,8 @@
try {
return any.extract_ulong();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -781,7 +789,8 @@
try {
return any.extract_float();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -796,7 +805,8 @@
try {
return any.extract_double();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -811,7 +821,8 @@
try {
return any.extract_string();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -826,7 +837,8 @@
try {
return any.extract_Object();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -841,7 +853,8 @@
try {
return any.extract_TypeCode();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -856,7 +869,8 @@
try {
return any.extract_longlong();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -871,7 +885,8 @@
try {
return any.extract_ulonglong();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -886,7 +901,8 @@
try {
return any.extract_wchar();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -901,7 +917,8 @@
try {
return any.extract_wstring();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -916,7 +933,8 @@
try {
return any.extract_any();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -992,7 +1010,8 @@
try {
return any.extract_Value();
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
}
@@ -1008,7 +1027,8 @@
try {
return org.omg.CORBA.BooleanSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1023,7 +1043,8 @@
try {
return org.omg.CORBA.OctetSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1038,7 +1059,8 @@
try {
return org.omg.CORBA.CharSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1053,7 +1075,8 @@
try {
return org.omg.CORBA.WCharSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1068,7 +1091,8 @@
try {
return org.omg.CORBA.ShortSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1083,7 +1107,8 @@
try {
return org.omg.CORBA.UShortSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1098,7 +1123,8 @@
try {
return org.omg.CORBA.LongSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1113,7 +1139,8 @@
try {
return org.omg.CORBA.ULongSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1128,7 +1155,8 @@
try {
return org.omg.CORBA.LongLongSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1143,7 +1171,8 @@
try {
return org.omg.CORBA.ULongLongSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1158,7 +1187,8 @@
try {
return org.omg.CORBA.FloatSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
@@ -1173,7 +1203,8 @@
try {
return org.omg.CORBA.DoubleSeqHelper.extract(any);
} catch (org.omg.CORBA.BAD_OPERATION e) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(e);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynBasic_impl.java Thu Jul 12 11:36:16 2007
@@ -21,6 +21,7 @@
import org.apache.yoko.orb.CORBA.InputStream;
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.CORBA.TypeCode;
+import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
final class DynBasic_impl extends DynAny_impl {
private Any any_;
@@ -108,7 +109,7 @@
org.apache.yoko.orb.OB.Assert
._OB_assert(origTC.type_modifier() == org.omg.CORBA.VM_CUSTOM.value);
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
any_ = new Any(orbInstance_, type, null);
break;
@@ -170,7 +171,8 @@
try {
any_ = new Any(value);
} catch (NullPointerException ex) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(ex);
}
org.omg.CORBA.TypeCode tc = any_._OB_type();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynEnum_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynEnum_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynEnum_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynEnum_impl.java Thu Jul 12 11:36:16 2007
@@ -141,10 +141,10 @@
try {
result = origType_.member_name(value_);
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -163,10 +163,10 @@
}
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -183,8 +183,8 @@
value_ = value;
notifyParent();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynFixed_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynFixed_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynFixed_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynFixed_impl.java Thu Jul 12 11:36:16 2007
@@ -21,6 +21,7 @@
import org.apache.yoko.orb.CORBA.InputStream;
import org.apache.yoko.orb.CORBA.OutputStream;
import org.apache.yoko.orb.CORBA.TypeCode;
+import org.omg.DynamicAny.DynAnyPackage.InvalidValue;
final class DynFixed_impl extends DynAny_impl implements
org.omg.DynamicAny.DynFixed {
@@ -71,7 +72,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -85,9 +87,10 @@
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
value_ = f;
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.CORBA.BAD_OPERATION ex) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(ex);
}
notifyParent();
@@ -169,7 +172,8 @@
try {
f = new java.math.BigDecimal(s);
} catch (NumberFormatException ex) {
- throw new org.omg.DynamicAny.DynAnyPackage.TypeMismatch();
+ throw (org.omg.DynamicAny.DynAnyPackage.TypeMismatch)new
+ org.omg.DynamicAny.DynAnyPackage.TypeMismatch().initCause(ex);
}
int origDigits = 0, origScale = 0;
@@ -177,7 +181,7 @@
origDigits = origType_.fixed_digits();
origScale = origType_.fixed_scale();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
int fDigits = 0, fScale = f.scale();
@@ -217,7 +221,7 @@
try {
out.write_fixed(value_.movePointRight(origType_.fixed_scale()));
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -230,7 +234,7 @@
try {
value_ = in.read_fixed().movePointLeft(origType_.fixed_scale());
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
notifyParent();
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynSeqBase_impl.java Thu Jul 12 11:36:16 2007
@@ -102,7 +102,7 @@
index_ = 0;
}
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -130,9 +130,9 @@
try {
setValue(i, p);
} catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.DynamicAny.DynAnyPackage.InvalidValue ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
notifyParent();
@@ -480,9 +480,9 @@
try {
components_[index].from_any(any);
} catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.DynamicAny.DynAnyPackage.InvalidValue ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -736,7 +736,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -1083,7 +1084,7 @@
if (len > 0 && value.length() > len)
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
String[] buf = (String[]) buf_;
@@ -1170,7 +1171,7 @@
if (len > 0 && value.length() > len)
throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
String[] buf = (String[]) buf_;
@@ -1611,7 +1612,7 @@
components_[i] = dynValueReader_.readValue(in,
contentType_);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynStruct_impl.java Thu Jul 12 11:36:16 2007
@@ -48,10 +48,10 @@
index_ = -1;
else
index_ = 0;
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -84,10 +84,10 @@
index_ = -1;
else
index_ = 0;
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -140,7 +140,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -151,7 +152,8 @@
try {
in = val.create_input_stream();
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
_OB_unmarshal((InputStream) in);
@@ -294,10 +296,10 @@
try {
result = origType_.member_name(index_);
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -319,10 +321,10 @@
org.omg.CORBA.TypeCode origMemberTC = TypeCode
._OB_getOrigType(memberTC);
result = origMemberTC.kind();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -337,10 +339,10 @@
result[i].id = origType_.member_name(i);
result[i].value = components_[i].to_any();
}
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -392,10 +394,10 @@
index_ = 0;
notifyParent();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -408,10 +410,10 @@
result[i].id = origType_.member_name(i);
result[i].value = components_[i];
}
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -452,10 +454,10 @@
index_ = 0;
notifyParent();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -472,8 +474,8 @@
if (origType_.kind() == org.omg.CORBA.TCKind.tk_except) {
try {
out.write_string(origType_.id());
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -493,11 +495,11 @@
try {
memberType = origType_.member_type(i);
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
@@ -515,7 +517,7 @@
try {
components_[i] = dynValueReader_.readValue(in, memberType);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynUnion_impl.java Thu Jul 12 11:36:16 2007
@@ -94,12 +94,12 @@
} else {
member_ = create(memberType, true);
}
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -182,10 +182,10 @@
member_ = create(origType_.member_type(i), true);
}
selectedMember_ = i;
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -238,9 +238,9 @@
org.apache.yoko.orb.OB.Assert._OB_assert(false);
}
} catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.DynamicAny.DynAnyPackage.InvalidValue ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -351,7 +351,7 @@
min = 0;
max = (origDiscTC_.member_count() - 1);
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
break;
}
@@ -427,7 +427,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -438,7 +439,8 @@
try {
in = val.create_input_stream();
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
_OB_unmarshal((InputStream) in);
@@ -495,7 +497,7 @@
return false;
}
} catch (org.omg.DynamicAny.DynAnyPackage.InvalidValue ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return true;
@@ -529,14 +531,14 @@
result.member().assign(member_);
}
}
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
} catch (org.omg.DynamicAny.DynAnyPackage.InvalidValue ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return result;
@@ -669,10 +671,10 @@
try {
return origType_.member_name(selectedMember_);
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return null; // The compiler needs this
@@ -685,10 +687,10 @@
try {
return origType_.member_type(selectedMember_).kind();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
return null; // The compiler needs this
@@ -729,11 +731,11 @@
try {
memberType = origType_.member_type(selectedMember_);
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
@@ -750,7 +752,7 @@
try {
member_ = dynValueReader_.readValue(in, memberType);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueBox_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueBox_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueBox_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueBox_impl.java Thu Jul 12 11:36:16 2007
@@ -38,7 +38,7 @@
try {
boxedType_ = origType_.content_type();
} catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
//
@@ -112,7 +112,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -123,7 +124,8 @@
try {
in = val.create_input_stream();
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
_OB_unmarshal((InputStream) in);
@@ -185,7 +187,7 @@
try {
result.set_boxed_value_as_dyn_any(component_);
} catch (org.omg.DynamicAny.DynAnyPackage.TypeMismatch ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -255,7 +257,8 @@
try {
val = new Any(boxed);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -340,8 +343,8 @@
impl._OB_marshal(out);
out._OB_endValue();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueReader.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueReader.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueReader.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValueReader.java Thu Jul 12 11:36:16 2007
@@ -62,7 +62,7 @@
if (tag == -1)
return readIndirection(in);
} catch (org.omg.CORBA.MARSHAL ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return null;
}
@@ -142,7 +142,7 @@
try {
copy = factory_impl.prepare_dyn_any_from_type_code(tc, this);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
DynAny_impl impl = (DynAny_impl) copy;
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/DynamicAny/DynValue_impl.java Thu Jul 12 11:36:16 2007
@@ -98,8 +98,8 @@
// Initial value is null
//
set_to_null();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -124,10 +124,10 @@
names.addElement(origTC.member_name(i));
types.addElement(origTC.member_type(i));
}
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
- } catch (org.omg.CORBA.TypeCodePackage.Bounds e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
+ } catch (org.omg.CORBA.TypeCodePackage.Bounds ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
@@ -218,7 +218,8 @@
try {
val = new Any(value);
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
}
@@ -229,7 +230,8 @@
try {
in = val.create_input_stream();
} catch (NullPointerException e) {
- throw new org.omg.DynamicAny.DynAnyPackage.InvalidValue();
+ throw (org.omg.DynamicAny.DynAnyPackage.InvalidValue)new
+ org.omg.DynamicAny.DynAnyPackage.InvalidValue().initCause(e);
}
_OB_unmarshal((InputStream) in);
@@ -502,8 +504,8 @@
}
out._OB_endValue();
- } catch (org.omg.CORBA.TypeCodePackage.BadKind e) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ } catch (org.omg.CORBA.TypeCodePackage.BadKind ex) {
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
}
}
}
@@ -549,7 +551,7 @@
try {
components_[i] = dynValueReader_.readValue(in, types_[i]);
} catch (org.omg.DynamicAny.DynAnyFactoryPackage.InconsistentTypeCode ex) {
- org.apache.yoko.orb.OB.Assert._OB_assert(false);
+ org.apache.yoko.orb.OB.Assert._OB_assert(ex);
return;
}
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ActiveStateStub.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ActiveStateStub.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ActiveStateStub.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ActiveStateStub.java Thu Jul 12 11:36:16 2007
@@ -66,7 +66,8 @@
final String _ob_id = _ob_aex.getId();
in = _ob_aex.getInputStream();
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -126,7 +127,8 @@
if(_ob_id.equals(_NoSuchPOAHelper.id()))
throw _NoSuchPOAHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -190,7 +192,8 @@
final String _ob_id = _ob_aex.getId();
in = _ob_aex.getInputStream();
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_DomainStub.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_DomainStub.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_DomainStub.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_DomainStub.java Thu Jul 12 11:36:16 2007
@@ -71,7 +71,8 @@
if(_ob_id.equals(ServerAlreadyRegisteredHelper.id()))
throw ServerAlreadyRegisteredHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -141,7 +142,8 @@
throw NoSuchOADHelper.read(in);
if(_ob_id.equals(OADNotRunningHelper.id()))
throw OADNotRunningHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
Modified: incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerDomainStub.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerDomainStub.java?view=diff&rev=555715&r1=555714&r2=555715
==============================================================================
--- incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerDomainStub.java (original)
+++ incubator/yoko/trunk/core/src/main/java/org/apache/yoko/orb/IMR/_ServerDomainStub.java Thu Jul 12 11:36:16 2007
@@ -65,7 +65,8 @@
final String _ob_id = _ob_aex.getId();
in = _ob_aex.getInputStream();
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -121,7 +122,8 @@
if(_ob_id.equals(OADAlreadyExistsHelper.id()))
throw OADAlreadyExistsHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -181,7 +183,8 @@
throw NoSuchOADHelper.read(in);
if(_ob_id.equals(OADRunningHelper.id()))
throw OADRunningHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -239,7 +242,8 @@
if(_ob_id.equals(NoSuchOADHelper.id()))
throw NoSuchOADHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -292,7 +296,8 @@
final String _ob_id = _ob_aex.getId();
in = _ob_aex.getInputStream();
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -352,7 +357,8 @@
if(_ob_id.equals(ServerAlreadyRegisteredHelper.id()))
throw ServerAlreadyRegisteredHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{
@@ -422,7 +428,8 @@
throw NoSuchOADHelper.read(in);
if(_ob_id.equals(OADNotRunningHelper.id()))
throw OADNotRunningHelper.read(in);
- throw new org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id);
+ throw (org.omg.CORBA.UNKNOWN)new
+ org.omg.CORBA.UNKNOWN("Unexpected User Exception: " + _ob_id).initCause(_ob_aex);
}
finally
{