Mercurial > jdk8-mips64-public > corba / file diff

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Fri Sep 24 16:38:05 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Fri Sep 24 22:42:14 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -33,14 +33,7 @@
    1.11  import java.nio.channels.SelectionKey;
    1.12  import java.nio.channels.ServerSocketChannel;
    1.13  import java.nio.channels.SocketChannel;
    1.14 -import java.security.AccessController;
    1.15 -import java.security.PrivilegedAction;
    1.16 -import java.util.Collection;
    1.17  import java.util.Iterator;
    1.18 -import java.util.LinkedList;
    1.19 -
    1.20 -import org.omg.CORBA.CompletionStatus;
    1.21 -import org.omg.CORBA.INTERNAL;
    1.22  
    1.23  import com.sun.corba.se.pept.broker.Broker;
    1.24  import com.sun.corba.se.pept.encoding.InputObject;
    1.25 @@ -61,18 +54,12 @@
    1.26  import com.sun.corba.se.spi.ior.iiop.IIOPProfileTemplate ;
    1.27  import com.sun.corba.se.spi.ior.iiop.GIOPVersion ;
    1.28  import com.sun.corba.se.spi.ior.iiop.AlternateIIOPAddressComponent;
    1.29 -import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo;
    1.30  import com.sun.corba.se.spi.logging.CORBALogDomains;
    1.31 -import com.sun.corba.se.spi.monitoring.LongMonitoredAttributeBase;
    1.32 -import com.sun.corba.se.spi.monitoring.MonitoringConstants;
    1.33 -import com.sun.corba.se.spi.monitoring.MonitoringFactories;
    1.34 -import com.sun.corba.se.spi.monitoring.MonitoredObject;
    1.35  import com.sun.corba.se.spi.orb.ORB;
    1.36  import com.sun.corba.se.spi.orbutil.threadpool.Work;
    1.37  import com.sun.corba.se.spi.protocol.CorbaMessageMediator;
    1.38  import com.sun.corba.se.spi.transport.CorbaAcceptor;
    1.39  import com.sun.corba.se.spi.transport.CorbaConnection;
    1.40 -import com.sun.corba.se.spi.transport.CorbaContactInfo;
    1.41  import com.sun.corba.se.spi.transport.SocketInfo;
    1.42  import com.sun.corba.se.spi.transport.SocketOrChannelAcceptor;
    1.43  
    1.44 @@ -82,7 +69,6 @@
    1.45  import com.sun.corba.se.impl.oa.poa.Policies; // REVISIT impl/poa specific
    1.46  import com.sun.corba.se.impl.orbutil.ORBConstants;
    1.47  import com.sun.corba.se.impl.orbutil.ORBUtility;
    1.48 -import com.sun.corba.se.impl.ior.iiop.JavaSerializationComponent;
    1.49  
    1.50  // BEGIN Legacy support.
    1.51  import com.sun.corba.se.spi.legacy.connection.LegacyServerSocketEndPointInfo;
    1.52 @@ -442,12 +428,7 @@
    1.53                  dprint(".doWork->: " + this);
    1.54              }
    1.55              if (selectionKey.isAcceptable()) {
    1.56 -                AccessController.doPrivileged(new PrivilegedAction() {
    1.57 -                    public java.lang.Object run() {
    1.58                          accept();
    1.59 -                        return null;
    1.60 -                    }
    1.61 -                });
    1.62              } else {
    1.63                  if (orb.transportDebugFlag) {
    1.64                      dprint(".doWork: ! selectionKey.isAcceptable: " + this);