Fixed (ICE-5510) - Remove Stats interface that was deprecated in 3.5

5 files changed, 0 insertions, 77 deletions

diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 2e4bbdbf855..af0ad562325 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -133,13 +133,6 @@ public final class CommunicatorI implements Communicator
         return _instance.initializationData().logger;
     }
 
-    @SuppressWarnings("deprecation")
-    public Stats
-    getStats()
-    {
-        return _instance.initializationData().stats;
-    }
-
     public Ice.Instrumentation.CommunicatorObserver 
     getObserver()
     {
diff --git a/java/src/Ice/InitializationData.java b/java/src/Ice/InitializationData.java
index b1267938056..e7ba8110505 100644
--- a/java/src/Ice/InitializationData.java
+++ b/java/src/Ice/InitializationData.java
@@ -15,7 +15,6 @@ package Ice;
  * @see Communicator#intialize
  * @see Properties
  * @see Logger
- * @see Stats
  * @see ThreadNotification
  **/
 public final class InitializationData implements Cloneable
@@ -64,12 +63,6 @@ public final class InitializationData implements Cloneable
     public Ice.Instrumentation.CommunicatorObserver observer;
 
     /**
-     * The <Stats> instance for the communicator.
-     **/
-    @SuppressWarnings("deprecation")
-    public Stats stats;
-
-    /**
      * The thread hook for the communicator.
      **/
     public ThreadNotification threadHook;
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index ac25f302187..7122f8ff7cf 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -202,11 +202,6 @@ final class TcpTransceiver implements Transceiver
                     _logger.trace(_traceLevels.networkCat, s);
                 }
 
-                if(_stats != null)
-                {
-                    _stats.bytesSent(type(), ret);
-                }
-
                 if(packetSize == _maxSendPacketSize)
                 {
                     assert(buf.b.position() == buf.b.limit());
@@ -261,11 +256,6 @@ final class TcpTransceiver implements Transceiver
                         String s = "received " + ret + " of " + packetSize + " bytes via tcp\n" + toString();
                         _logger.trace(_traceLevels.networkCat, s);
                     }
-
-                    if(_stats != null)
-                    {
-                        _stats.bytesReceived(type(), ret);
-                    }
                 }
 
                 packetSize = buf.b.remaining();
@@ -331,7 +321,6 @@ final class TcpTransceiver implements Transceiver
         _addr = addr;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
-        _stats = instance.initializationData().stats;
         _state = StateNeedConnect;
         _desc = "";
 
@@ -357,7 +346,6 @@ final class TcpTransceiver implements Transceiver
         _fd = fd;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
-        _stats = instance.initializationData().stats;
         _state = StateConnected;
         _desc = Network.fdToString(_fd);
 
@@ -400,8 +388,6 @@ final class TcpTransceiver implements Transceiver
     private TraceLevels _traceLevels;
     private Ice.Logger _logger;
 
-    @SuppressWarnings("deprecation")
-    private Ice.Stats _stats;
     private String _desc;
     private int _state;
     private int _maxSendPacketSize;
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 5b8e3105c1c..96174b95c26 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -116,11 +116,6 @@ final class UdpTransceiver implements Transceiver
             _logger.trace(_traceLevels.networkCat, s);
         }
 
-        if(_stats != null)
-        {
-            _stats.bytesSent(type(), ret);
-        }
-
         assert(ret == buf.b.limit());
         return true;
     }
@@ -190,11 +185,6 @@ final class UdpTransceiver implements Transceiver
             _logger.trace(_traceLevels.networkCat, s);
         }
 
-        if(_stats != null)
-        {
-            _stats.bytesReceived(type(), ret);
-        }
-
         buf.resize(ret, true);
         buf.b.position(ret);
 
@@ -304,7 +294,6 @@ final class UdpTransceiver implements Transceiver
     {
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
-        _stats = instance.initializationData().stats;
         _state = StateNeedConnect;
         _addr = addr;
 
@@ -345,7 +334,6 @@ final class UdpTransceiver implements Transceiver
     {
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
-        _stats = instance.initializationData().stats;
         _state = connect ? StateNeedConnect : StateNotConnected;
 
         try
@@ -746,8 +734,6 @@ final class UdpTransceiver implements Transceiver
     private TraceLevels _traceLevels;
     private Ice.Logger _logger;
 
-    @SuppressWarnings("deprecation")
-    private Ice.Stats _stats;
     private int _state;
     private int _rcvSize;
     private int _sndSize;
diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java
index 2b43c86285f..560b278dfdf 100644
--- a/java/src/IceSSL/TransceiverI.java
+++ b/java/src/IceSSL/TransceiverI.java
@@ -280,11 +280,6 @@ final class TransceiverI implements IceInternal.Transceiver
             _logger.trace(_instance.networkTraceCategory(), s);
         }
 
-        if(_stats != null && buf.b.position() > pos)
-        {
-            _stats.bytesReceived(type(), buf.b.position() - pos);
-        }
-
         //
         // Read and decrypt more data if necessary. Note that we might read
         // more data from the socket than is actually necessary to fill the
@@ -332,11 +327,6 @@ final class TransceiverI implements IceInternal.Transceiver
                     String s = "received " + (buf.b.position() - pos) + " of " + rem + " bytes via ssl\n" + toString();
                     _logger.trace(_instance.networkTraceCategory(), s);
                 }
-
-                if(_stats != null && buf.b.position() > pos)
-                {
-                    _stats.bytesReceived(type(), buf.b.position() - pos);
-                }
             }
         }
         catch(SSLException ex)
@@ -408,14 +398,6 @@ final class TransceiverI implements IceInternal.Transceiver
         _engine = engine;
         _fd = fd;
         _logger = instance.communicator().getLogger();
-        try
-        {
-            _stats = instance.communicator().getStats();
-        }
-        catch(Ice.CommunicatorDestroyedException ex)
-        {
-            // Ignore.
-        }
         _maxPacketSize = 0;
         if(System.getProperty("os.name").startsWith("Windows"))
         {
@@ -717,11 +699,6 @@ final class TransceiverI implements IceInternal.Transceiver
                                 toString();
                             _logger.trace(_instance.networkTraceCategory(), s);
                         }
-
-                        if(_stats != null)
-                        {
-                            _stats.bytesSent(type(), result.bytesConsumed());
-                        }
                     }
                 }
 
@@ -932,11 +909,6 @@ final class TransceiverI implements IceInternal.Transceiver
                     String s = "sent " + ret + " of " + packetSize + " bytes via tcp\n" + toString();
                     _logger.trace(_instance.networkTraceCategory(), s);
                 }
-
-                if(_stats != null)
-                {
-                    _stats.bytesSent(type(), ret);
-                }
             }
             catch(java.io.InterruptedIOException ex)
             {
@@ -980,11 +952,6 @@ final class TransceiverI implements IceInternal.Transceiver
                         String s = "received " + ret + " of " + packetSize + " bytes via tcp\n" + toString();
                         _logger.trace(_instance.networkTraceCategory(), s);
                     }
-
-                    if(_stats != null)
-                    {
-                        _stats.bytesReceived(type(), ret);
-                    }
                 }
 
                 packetSize = buf.b.remaining();
@@ -1013,8 +980,6 @@ final class TransceiverI implements IceInternal.Transceiver
     private int _state;
     private Ice.Logger _logger;
 
-    @SuppressWarnings("deprecation")
-    private Ice.Stats _stats;
     private String _desc;
     private int _maxPacketSize;
     private ByteBuffer _appInput; // Holds clear-text data to be read by the application.