You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/09/26 18:15:48 UTC
[3/4] git commit: update facade and property interceptor to fix
propertyExists(), handle properties that do exist with a null value
update facade and property interceptor to fix propertyExists(), handle properties that do exist with a null value
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/72c2d666
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/72c2d666
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/72c2d666
Branch: refs/heads/master
Commit: 72c2d666a625550ce3bf7315932bcb7f8f97cb66
Parents: ee8a4cb
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Sep 26 17:05:40 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Sep 26 17:15:15 2014 +0100
----------------------------------------------------------------------
.../qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java | 2 +-
.../amqp/message/AmqpJmsMessagePropertyIntercepter.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/72c2d666/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 6855b60..6a637c6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -158,7 +158,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
@Override
public boolean propertyExists(String key) throws JMSException {
- return AmqpJmsMessagePropertyIntercepter.getProperty(this, key) != null;
+ return AmqpJmsMessagePropertyIntercepter.propertyExists(this, key);
}
public boolean applicationPropertyExists(String key) throws JMSException {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/72c2d666/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index e5c60e5..c9607aa 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -222,14 +222,16 @@ public class AmqpJmsMessagePropertyIntercepter {
* @param name
* the property name that is being checked.
*
+ * @return true if the message contains the given property.
+ *
* @throws JMSException if an error occurs while inspecting the defined property.
*/
- public static void propertyExists(AmqpJmsMessageFacade message, String name) throws JMSException {
+ public static boolean propertyExists(AmqpJmsMessageFacade message, String name) throws JMSException {
PropertyIntercepter propertyExpression = PROPERTY_INTERCEPTERS.get(name);
if (propertyExpression != null) {
- propertyExpression.propertyExists(message);
+ return propertyExpression.propertyExists(message);
} else {
- message.applicationPropertyExists(name);
+ return message.applicationPropertyExists(name);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org