/[classpath]/classpath/gnu/CORBA/gnuRequest.java
ViewVC logotype

Diff of /classpath/gnu/CORBA/gnuRequest.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.15 by audriusa, Fri Oct 28 10:33:41 2005 UTC revision 1.16 by audriusa, Fri Oct 28 12:04:39 2005 UTC
# Line 295  public class gnuRequest extends Request Line 295  public class gnuRequest extends Request
295      orb = an_orb;      orb = an_orb;
296    
297      // Take the interceptor from the ORB.      // Take the interceptor from the ORB.
298      if (orb instanceof Restricted_ORB)      if (orb instanceof OrbRestricted)
299        m_interceptor = ((Restricted_ORB) orb).iClient;        m_interceptor = ((OrbRestricted) orb).iClient;
300    
301      if (m_interceptor != null && orb instanceof ORB_1_4)      if (m_interceptor != null && orb instanceof ORB_1_4)
302        {        {
# Line 514  public class gnuRequest extends Request Line 514  public class gnuRequest extends Request
514                  try                  try
515                    {                    {
516                      ObjectImpl impl = (ObjectImpl) e.forward;                      ObjectImpl impl = (ObjectImpl) e.forward;
517                      Simple_delegate delegate =                      SimpleDelegate delegate =
518                        (Simple_delegate) impl._get_delegate();                        (SimpleDelegate) impl._get_delegate();
519                      ior = delegate.getIor();                      ior = delegate.getIor();
520                    }                    }
521                  catch (Exception ex)                  catch (Exception ex)
# Line 794  public class gnuRequest extends Request Line 794  public class gnuRequest extends Request
794                {                {
795                  try                  try
796                    {                    {
797                      if (orb instanceof Functional_ORB)                      if (orb instanceof OrbFunctional)
798                        socket = ((Functional_ORB) orb).socketFactory.createClientSocket(                        socket = ((OrbFunctional) orb).socketFactory.createClientSocket(
799                          ior.Internet.host, ior.Internet.port);                          ior.Internet.host, ior.Internet.port);
800                      else                      else
801                        socket = new Socket(ior.Internet.host, ior.Internet.port);                        socket = new Socket(ior.Internet.host, ior.Internet.port);
# Line 840  public class gnuRequest extends Request Line 840  public class gnuRequest extends Request
840              response_header.read(socketInput);              response_header.read(socketInput);
841    
842              byte[] r;              byte[] r;
843              if (orb instanceof Functional_ORB)              if (orb instanceof OrbFunctional)
844                {                {
845                  Functional_ORB fo = (Functional_ORB) orb;                  OrbFunctional fo = (OrbFunctional) orb;
846                  r = response_header.readMessage(socketInput, socket,                  r = response_header.readMessage(socketInput, socket,
847                    fo.TOUT_WHILE_READING, fo.TOUT_AFTER_RECEIVING);                    fo.TOUT_WHILE_READING, fo.TOUT_AFTER_RECEIVING);
848                }                }
# Line 868  public class gnuRequest extends Request Line 868  public class gnuRequest extends Request
868            {            {
869              if (socket != null && !socket.isClosed())              if (socket != null && !socket.isClosed())
870                {                {
871                  socket.setSoTimeout(Functional_ORB.TANDEM_REQUESTS);                  socket.setSoTimeout(OrbFunctional.TANDEM_REQUESTS);
872                  SocketRepository.put_socket(key, socket);                  SocketRepository.put_socket(key, socket);
873                }                }
874            }            }
# Line 1182  public class gnuRequest extends Request Line 1182  public class gnuRequest extends Request
1182     */     */
1183    public org.omg.CORBA.Object effective_target()    public org.omg.CORBA.Object effective_target()
1184    {    {
1185      return new IOR_contructed_object(orb, ior);      return new IorObject(orb, ior);
1186    }    }
1187    
1188    /**    /**
# Line 1295  public class gnuRequest extends Request Line 1295  public class gnuRequest extends Request
1295        return m_forwarding_target;        return m_forwarding_target;
1296    
1297      if (m_forward_ior != null)      if (m_forward_ior != null)
1298        return new IOR_contructed_object(orb, m_forward_ior);        return new IorObject(orb, m_forward_ior);
1299      else      else
1300        return null;        return null;
1301    }    }

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26