|
From: Michael R. <mr...@us...> - 2002-01-11 08:30:29
|
Update of /cvsroot/openorb/OpenORB/src/main/org/openorb/adapter/poa
In directory usw-pr-cvs1:/tmp/cvs-serv29664/src/main/org/openorb/adapter/poa
Modified Files:
POA.java
Log Message:
Fix for #502230/#771
Index: POA.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/main/org/openorb/adapter/poa/POA.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- POA.java 2002/01/09 12:30:01 1.1.1.1
+++ POA.java 2002/01/11 08:30:26 1.2
@@ -566,7 +566,7 @@
if(force_marshal)
return true;
try {
- org.omg.CORBA.portable.ServantObject so = servant_preinvoke(object_key, "_non_existent", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject so = servant_preinvoke(object_key, "_non_existent", Servant.class, false);
if(so == null)
return true;
boolean ret = (so.servant instanceof DynamicImplementation);
@@ -818,7 +818,7 @@
throws org.omg.PortableInterceptor.ForwardRequest, AdapterDestroyedException
{
try {
- org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_locate", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_locate", Servant.class, false);
servant_postinvoke(object_key, target);
return true;
}
@@ -835,7 +835,7 @@
*/
public boolean is_a(byte[] object_key,String repository_id) throws org.omg.PortableInterceptor.ForwardRequest, AdapterDestroyedException
{
- org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_is_a", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_is_a", Servant.class, false);
try {
Servant serv = (Servant)target.servant;
return serv._is_a(repository_id);
@@ -855,7 +855,7 @@
public org.omg.CORBA.Object get_interface_def(byte[] object_key)
throws org.omg.PortableInterceptor.ForwardRequest, AdapterDestroyedException
{
- org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_interface", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_interface", Servant.class, false);
try {
Servant srv = (Servant)target.servant;
return srv._get_interface_def();
@@ -875,7 +875,7 @@
public org.omg.CORBA.DomainManager[] get_domain_managers(byte[] object_key)
throws org.omg.PortableInterceptor.ForwardRequest, AdapterDestroyedException
{
- org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_get_domain_managers", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_get_domain_managers", Servant.class, false);
try {
DispatchState state = (DispatchState)target;
return get_domain_managers(state.getRepositoryID(), state.getObjectID());
@@ -917,7 +917,7 @@
public org.omg.CORBA.Object get_component(byte[] object_key)
throws org.omg.PortableInterceptor.ForwardRequest, AdapterDestroyedException
{
- org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_component", Servant.class, true);
+ org.omg.CORBA.portable.ServantObject target = servant_preinvoke(object_key, "_component", Servant.class, false);
try {
return get_component((Servant)target.servant, object_key);
}
|