Author: ritchiem
Date: Mon Oct 19 11:11:30 2009
New Revision: 826639
URL: http://svn.apache.org/viewvc?rev=826639&view=rev
Log:
Remove Java 1.6 @Overrides on interface implmentations
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=826639&r1=826638&r2=826639&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Mon Oct 19 11:11:30 2009
@@ -201,7 +201,6 @@
return _actor;
}
- @Override
public void received(final ByteBuffer msg)
{
_lastIoTime = System.currentTimeMillis();
@@ -210,7 +209,6 @@
final ArrayList<AMQDataBlock> dataBlocks =
_codecFactory.getDecoder().decodeBuffer(msg);
Job.fireAsynchEvent(_poolReference.getPool(), _readJob, new
Runnable()
{
- @Override
public void run()
{
// Decode buffer
@@ -457,7 +455,6 @@
_writtenBytes += buf.remaining();
Job.fireAsynchEvent(_poolReference.getPool(), _writeJob, new Runnable()
{
- @Override
public void run()
{
_networkDriver.send(buf);
@@ -679,6 +676,7 @@
/** This must be called when the session is _closed in order to free up
any resources managed by the session. */
public void closeSession() throws AMQException
{
+ // REMOVE THIS SHOULD NOT BE HERE.
if (CurrentActor.get() == null)
{
CurrentActor.set(_actor);
@@ -694,6 +692,8 @@
if (_managedObject != null)
{
_managedObject.unregister();
+ // Ensure we only do this once.
+ _managedObject = null;
}
for (Task task : _taskList)
@@ -920,7 +920,6 @@
return _dispatcher;
}
- @Override
public void closed()
{
try
@@ -933,25 +932,21 @@
}
}
- @Override
public void readerIdle()
{
// Nothing
}
- @Override
public void setNetworkDriver(NetworkDriver driver)
{
_networkDriver = driver;
}
- @Override
public void writerIdle()
{
_networkDriver.send(HeartbeatBody.FRAME.toNioByteBuffer());
}
- @Override
public void exception(Throwable throwable)
{
if (throwable instanceof AMQProtocolHeaderException)
@@ -980,19 +975,16 @@
}
}
- @Override
public void init()
{
// Do nothing
}
- @Override
public void setSender(Sender<ByteBuffer> sender)
{
// Do nothing
}
- @Override
public long getReadBytes()
{
return _readBytes;
@@ -1018,7 +1010,6 @@
return (_clientVersion == null) ? null : _clientVersion.toString();
}
- @Override
public void closeIfLingeringClosedChannels()
{
for (Entry<Integer, Long>id : _closingChannelsList.entrySet())
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=826639&r1=826638&r2=826639&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Mon Oct 19 11:11:30 2009
@@ -285,7 +285,6 @@
failoverThread.start();
}
- @Override
public void readerIdle()
{
_logger.debug("Protocol Session [" + this + "] idle: reader");
@@ -295,7 +294,6 @@
_networkDriver.close();
}
- @Override
public void writerIdle()
{
_logger.debug("Protocol Session [" + this + "] idle: reader");
@@ -421,7 +419,6 @@
private static int _messageReceivedCount;
- @Override
public void received(ByteBuffer msg)
{
try
@@ -431,7 +428,6 @@
Job.fireAsynchEvent(_poolReference.getPool(), _readJob, new
Runnable()
{
- @Override
public void run()
{
// Decode buffer
@@ -566,7 +562,6 @@
_writtenBytes += buf.remaining();
Job.fireAsynchEvent(_poolReference.getPool(), _writeJob, new Runnable()
{
- @Override
public void run()
{
_networkDriver.send(buf);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
