2 files changed, 14 insertions, 0 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
index a1e3dee024..9ef7a47e1b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
@@ -64,6 +64,11 @@ public abstract class ConnectionDelegate
         conn.dispatch(method);
     }
 
+    @Override public void connectionHeartbeat(Connection conn, ConnectionHeartbeat hearbeat)
+    {
+        // do nothing
+    }
+
     @Override public void connectionClose(Connection conn, ConnectionClose close)
     {
         conn.connectionCloseOk();
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index 7ce41db4d0..dca6264367 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -382,4 +382,13 @@ public class ConnectionTest extends TestCase implements SessionListener
         ssn.sync();
     }
 
+    public void testHeartbeat()
+    {
+        startServer();
+        Connection conn = new Connection();
+        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connectionHeartbeat();
+        conn.close();
+    }
+
 }