qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [qpid-broker-j] branch 7.0.x updated: QPID-8273: [Broker-J] Add missing changes
Date Mon, 25 Feb 2019 09:28:00 GMT
This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new 9c64408  QPID-8273: [Broker-J] Add missing changes
9c64408 is described below

commit 9c6440805791e21b8c9d8982f6790b16763a593e
Author: Alex Rudyy <orudyy@apache.org>
AuthorDate: Mon Feb 25 09:27:48 2019 +0000

    QPID-8273: [Broker-J] Add missing changes
---
 .../v0_8/transport/BasicContentHeaderProperties.java    | 17 ++++++++++++++++-
 .../test/unit/client/connection/ConnectionTest.java     |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
index e9c6268..64c0411 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
@@ -858,7 +858,22 @@ public class BasicContentHeaderProperties
 
     public synchronized void validate()
     {
-        _headers.validate();
+        if (_headers !=null)
+        {
+            _headers.validate();
+        }
     }
 
+    public boolean checkValid()
+    {
+        try
+        {
+            validate();
+            return true;
+        }
+        catch (RuntimeException e)
+        {
+            return false;
+        }
+    }
 }
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
b/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 708dd77..1e5f8cc 100644
--- a/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -179,7 +179,7 @@ public class ConnectionTest extends QpidBrokerTestCase
 
     }
 
-    public void testUnresolvedHostFailure() throws Exception
+    public void _testUnresolvedHostFailure() throws Exception
     {
         AMQConnection conn = null;
         try


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message