Author: rajith
Date: Tue Jan 19 23:28:45 2010
New Revision: 901000
URL: http://svn.apache.org/viewvc?rev=901000&view=rev
Log:
Changed the setIdleTimeout method to take an int instead of a long.
The socket interface takes the so_timeout as an int and also the AMQP heartbeat
interval is taken as an int.
This change will help simplify the code that handles heartbeats.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/SSLSender.java
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
Tue Jan 19 23:28:45 2010
@@ -295,7 +295,7 @@
public void setIdleTimeout(long l)
{
- _qpidConnection.setIdleTimeout(l);
+ _qpidConnection.setIdleTimeout((int)l);
}
public int getMaxChannelID()
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/ConsoleOutput.java
Tue Jan 19 23:28:45 2010
@@ -51,7 +51,7 @@
System.out.println("CLOSED");
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
// TODO Auto-generated method stub
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
Tue Jan 19 23:28:45 2010
@@ -200,20 +200,20 @@
*/
private int calculateHeartbeatInterval(Connection conn,int min, int max)
{
- long l = conn.getIdleTimeout()/1000;
- if (l == 0)
+ int i = conn.getIdleTimeout()/1000;
+ if (i == 0)
{
log.warn("Idle timeout is zero. Heartbeats are disabled");
return 0; // heartbeats are disabled.
}
- else if (l >= min && l <= max)
+ else if (i >= min && i <= max)
{
- return (int)l;
+ return i;
}
else
{
log.warn("Ignoring the idle timeout %s set by the connection," +
- " using the brokers max value %s", l,max);
+ " using the brokers max value %s", i,max);
return max;
}
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
Tue Jan 19 23:28:45 2010
@@ -83,7 +83,7 @@
private String locale;
private SaslServer saslServer;
private SaslClient saslClient;
- private long idleTimeout = 0;
+ private int idleTimeout = 0;
private String _authorizationID;
private String userID;
@@ -522,16 +522,16 @@
}
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
- idleTimeout = l;
+ idleTimeout = i;
if (sender != null)
{
- sender.setIdleTimeout(l);
+ sender.setIdleTimeout(i);
}
}
- public long getIdleTimeout()
+ public int getIdleTimeout()
{
return idleTimeout;
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/Sender.java
Tue Jan 19 23:28:45 2010
@@ -28,7 +28,7 @@
public interface Sender<T>
{
- void setIdleTimeout(long l);
+ void setIdleTimeout(int i);
void send(T msg);
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
Tue Jan 19 23:28:45 2010
@@ -238,8 +238,8 @@
throw new IllegalArgumentException("" + error);
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
- sender.setIdleTimeout(l);
+ sender.setIdleTimeout(i);
}
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
Tue Jan 19 23:28:45 2010
@@ -56,7 +56,6 @@
private final Object notEmpty = new Object();
private final AtomicBoolean closed = new AtomicBoolean(false);
private final Thread senderThread;
- private long idleTimeout;
private volatile Throwable exception = null;
@@ -294,12 +293,11 @@
}
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
try
{
- socket.setSoTimeout((int)l*2);
- idleTimeout = l;
+ socket.setSoTimeout(i*2);
}
catch (Exception e)
{
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MINANetworkDriver.java
Tue Jan 19 23:28:45 2010
@@ -285,7 +285,7 @@
_lastWriteFuture = _ioSession.write(minaBuf);
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
// MINA doesn't support setting SO_TIMEOUT
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaSender.java
Tue Jan 19 23:28:45 2010
@@ -77,7 +77,7 @@
closed.join();
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
//noop
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/nio/NioSender.java
Tue Jan 19 23:28:45 2010
@@ -119,7 +119,7 @@
}
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
//noop
}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/SSLSender.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/SSLSender.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/SSLSender.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/SSLSender.java
Tue Jan 19 23:28:45 2010
@@ -248,8 +248,8 @@
return engineState;
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
- delegate.setIdleTimeout(l);
+ delegate.setIdleTimeout(i);
}
}
Modified:
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java?rev=901000&r1=900999&r2=901000&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
(original)
+++
qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/TestNetworkDriver.java
Tue Jan 19 23:28:45 2010
@@ -109,7 +109,7 @@
}
- public void setIdleTimeout(long l)
+ public void setIdleTimeout(int i)
{
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
