summaryrefslogtreecommitdiff
path: root/qpid/java/common/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-12-12 16:04:52 +0000
committerKeith Wall <kwall@apache.org>2014-12-12 16:04:52 +0000
commit57f62fb2e1dc7bb04a2bee4072992fb00f310126 (patch)
treefead3c849fb21e2a95765223128546c82314194e /qpid/java/common/src
parentf5c07292ad4754608b8f9876241baac671fdce3b (diff)
downloadqpid-python-57f62fb2e1dc7bb04a2bee4072992fb00f310126.tar.gz
Remove dead setIdleTimeout method
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1644950 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java2
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java15
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java1
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java5
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java12
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java6
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java5
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java4
8 files changed, 0 insertions, 50 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 1866e1fd15..c2a0911bc3 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -153,11 +153,9 @@ public class ClientDelegate extends ConnectionDelegate
maxFrameSize,
actualHeartbeatInterval);
- int idleTimeout = (int)(actualHeartbeatInterval * 1000 * heartbeatTimeoutFactor);
conn.getNetworkConnection().setMaxReadIdle((int)(actualHeartbeatInterval*heartbeatTimeoutFactor));
conn.getNetworkConnection().setMaxWriteIdle(actualHeartbeatInterval);
conn.setMaxFrameSize(maxFrameSize == 0 ? 0xffff : maxFrameSize);
- conn.setIdleTimeout(idleTimeout);
int channelMax = tune.getChannelMax();
//0 means no implied limit, except available server resources
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index e33e007f6e..92ccdb84af 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -159,7 +159,6 @@ public class Connection extends ConnectionInvoker
public void setSender(Sender<ProtocolEvent> sender)
{
this.sender = sender;
- sender.setIdleTimeout(idleTimeout);
}
protected void setState(State state)
@@ -675,20 +674,6 @@ public class Connection extends ConnectionInvoker
}
}
- public void setIdleTimeout(int i)
- {
- idleTimeout = i;
- if (sender != null)
- {
- sender.setIdleTimeout(i);
- }
- }
-
- public int getIdleTimeout()
- {
- return idleTimeout;
- }
-
public String getUserID()
{
return userID;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
index 6519702c76..9a6f675d7f 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
@@ -28,7 +28,6 @@ package org.apache.qpid.transport;
public interface Sender<T>
{
- void setIdleTimeout(int i);
void send(T msg);
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
index a804cb2f9d..81a4c781a4 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
@@ -251,11 +251,6 @@ public final class Disassembler implements Sender<ProtocolEvent>, ProtocolDelega
throw new IllegalArgumentException(String.valueOf(error));
}
- public void setIdleTimeout(int i)
- {
- sender.setIdleTimeout(i);
- }
-
@Override
public void setMaxFrameSize(final int maxFrame)
{
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
index eef418df79..79e99287c4 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
@@ -316,18 +316,6 @@ public final class IoSender implements Runnable, Sender<ByteBuffer>
}
}
- public void setIdleTimeout(int i)
- {
- try
- {
- socket.setSoTimeout(i);
- }
- catch (Exception e)
- {
- throw new SenderException(e);
- }
- }
-
public void setReceiver(IoReceiver receiver)
{
_receiver = receiver;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
index d420b6b3a0..acc2b89881 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/NonBlockingSenderReceiver.java
@@ -154,12 +154,6 @@ public class NonBlockingSenderReceiver implements Runnable, Sender<ByteBuffer>
}
@Override
- public void setIdleTimeout(final int i)
- {
- // Probably unused - dead code to be removed??
- }
-
- @Override
public void send(final ByteBuffer msg)
{
if (_closed.get())
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
index 098f2fb20c..fa1801cb65 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
@@ -103,11 +103,6 @@ public class SASLSender extends SASLEncryptor implements Sender<ByteBuffer> {
}
}
- public void setIdleTimeout(int i)
- {
- delegate.setIdleTimeout(i);
- }
-
public void securityLayerEstablished()
{
appData = new byte[getSendBuffSize()];
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
index 7c61136b42..7d64012fea 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
@@ -264,8 +264,4 @@ public class SSLSender implements Sender<ByteBuffer>
}
}
- public void setIdleTimeout(int i)
- {
- delegate.setIdleTimeout(i);
- }
}