git commit: Add some initial support for gathing connection capabilities and properties into a config object. Start on real anonymous producer support.
Repository: qpid-jms
Updated Branches:
refs/heads/master 95941245a -> e3039f140
Add some initial support for gathing connection capabilities and
properties into a config object. Start on real anonymous producer
support.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e3039f14
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e3039f14
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e3039f14
Branch: refs/heads/master
Commit: e3039f140e10d5f427e25fb4d0de92133667468b
Parents: 9594124
Author: Timothy Bish
Authored: Mon Oct 13 18:50:11 2014 -0400
Committer: Timothy Bish
Committed: Mon Oct 13 18:50:11 2014 -0400
--
.../qpid/jms/provider/amqp/AmqpConnection.java | 16 +
.../provider/amqp/AmqpConnectionProperties.java | 69
.../jms/provider/amqp/AmqpFixedProducer.java| 16 +++--
.../qpid/jms/provider/amqp/AmqpSession.java | 5 +-
4 files changed, 97 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e3039f14/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
index e53d5da..97118d7 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnection.java
@@ -49,6 +49,7 @@ public class AmqpConnection extends
AbstractAmqpResourcehttp://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e3039f14/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionProperties.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionProperties.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionProperties.java
new file mode 100644
index 000..add4d72
--- /dev/null
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionProperties.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.provider.amqp;
+
+import java.util.Map;
+
+import org.apache.qpid.proton.amqp.Symbol;
+
+/**
+ * Class used to examine the capabilities and connection properties of the
+ * remote connection and provide that information to the client code in a
+ * simpler and more easy to digest manner.
+ */
+public class AmqpConnectionProperties {
+
+private static final Symbol ANONYMOUS_RELAY =
Symbol.valueOf("x-opt-anonymous-relay");
+
+private String anonymousRelayName;
+
+/**
+ * Creates a new instance of this class from the given remote capabilities
and properties.
+ *
+ * @param capabilities
+ *the capabilities offered by the remote connection.
+ * @param properties
+ *the properties offered by the remote connection.
+ */
+public AmqpConnectionProperties(Symbol[] capabilities, Map
properties) {
+if (capabilities != null) {
+processCapabilities(capabilities);
+}
+
+if (properties != null) {
+processProperties(properties);
+}
+}
+
+public boolean isAnonymousRelaySupported() {
+return anonymousRelayName != null;
+}
+
+public String getAnonymousRelayName() {
+return anonymousRelayName;
+}
+
+protected void processCapabilities(Symbol[] capabilities) {
+// TODO - Inspect capabilities for configuration options
+}
+
+protected void processProperties(Map properties) {
+if (properties.containsKey(ANONYMOUS_RELAY)) {
+anonymousRelayName = (String) properties.get(ANONYMOUS_RELAY);
+}
+}
+}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e3039f14/qpid-jms-client/src/mai
svn commit: r1631543 - in /qpid/proton/trunk: proton-c/bindings/python/ proton-j/src/main/java/org/apache/qpid/proton/engine/ proton-j/src/main/java/org/apache/qpid/proton/engine/impl/
Author: rhs
Date: Mon Oct 13 20:50:58 2014
New Revision: 1631543
URL: http://svn.apache.org/r1631543
Log:
added dispatch code to event class
Added:
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/BaseHandler.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Handler.java
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/EventImpl.java
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1631543&r1=1631542&r2=1631543&view=diff
==
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Oct 13 20:50:58
2014
@@ -2911,6 +2911,10 @@ class Delivery(object):
self._dlv = None
@property
+ def released(self):
+return self._dlv is None
+
+ @property
def tag(self):
return pn_delivery_tag(self._dlv)
@@ -3364,7 +3368,7 @@ class Collector:
clazz = pn_class_name(pn_event_class(event))
context = wrappers[clazz](pn_event_context(event))
-return Event(clazz, context, pn_event_type(event))
+return Event(clazz, context, EventType.TYPES[pn_event_type(event)])
def pop(self):
ev = self.peek()
@@ -3375,41 +3379,54 @@ class Collector:
def __del__(self):
pn_collector_free(self._impl)
+class EventType:
+
+ TYPES = {}
+
+ def __init__(self, number, method):
+self.number = number
+self.name = pn_event_type_name(self.number)
+self.method = method
+self.TYPES[number] = self
+
+ def __repr__(self):
+return self.name
+
class Event:
- CONNECTION_INIT = PN_CONNECTION_INIT
- CONNECTION_BOUND = PN_CONNECTION_BOUND
- CONNECTION_UNBOUND = PN_CONNECTION_UNBOUND
- CONNECTION_LOCAL_OPEN = PN_CONNECTION_LOCAL_OPEN
- CONNECTION_LOCAL_CLOSE = PN_CONNECTION_LOCAL_CLOSE
- CONNECTION_REMOTE_OPEN = PN_CONNECTION_REMOTE_OPEN
- CONNECTION_REMOTE_CLOSE = PN_CONNECTION_REMOTE_CLOSE
- CONNECTION_FINAL = PN_CONNECTION_FINAL
-
- SESSION_INIT = PN_SESSION_INIT
- SESSION_LOCAL_OPEN = PN_SESSION_LOCAL_OPEN
- SESSION_LOCAL_CLOSE = PN_SESSION_LOCAL_CLOSE
- SESSION_REMOTE_OPEN = PN_SESSION_REMOTE_OPEN
- SESSION_REMOTE_CLOSE = PN_SESSION_REMOTE_CLOSE
- SESSION_FINAL = PN_SESSION_FINAL
-
- LINK_INIT = PN_LINK_INIT
- LINK_LOCAL_OPEN = PN_LINK_LOCAL_OPEN
- LINK_LOCAL_CLOSE = PN_LINK_LOCAL_CLOSE
- LINK_LOCAL_DETACH = PN_LINK_LOCAL_DETACH
- LINK_REMOTE_OPEN = PN_LINK_REMOTE_OPEN
- LINK_REMOTE_CLOSE = PN_LINK_REMOTE_CLOSE
- LINK_REMOTE_DETACH = PN_LINK_REMOTE_DETACH
- LINK_FLOW = PN_LINK_FLOW
- LINK_FINAL = PN_LINK_FINAL
-
- DELIVERY = PN_DELIVERY
-
- TRANSPORT = PN_TRANSPORT
- TRANSPORT_ERROR = PN_TRANSPORT_ERROR
- TRANSPORT_HEAD_CLOSED = PN_TRANSPORT_HEAD_CLOSED
- TRANSPORT_TAIL_CLOSED = PN_TRANSPORT_TAIL_CLOSED
- TRANSPORT_CLOSED = PN_TRANSPORT_CLOSED
+ CONNECTION_INIT = EventType(PN_CONNECTION_INIT, "on_connection_init")
+ CONNECTION_BOUND = EventType(PN_CONNECTION_BOUND, "on_connection_bound")
+ CONNECTION_UNBOUND = EventType(PN_CONNECTION_UNBOUND,
"on_connection_unbound")
+ CONNECTION_LOCAL_OPEN = EventType(PN_CONNECTION_LOCAL_OPEN,
"on_connection_local_open")
+ CONNECTION_LOCAL_CLOSE = EventType(PN_CONNECTION_LOCAL_CLOSE,
"on_connection_local_close")
+ CONNECTION_REMOTE_OPEN = EventType(PN_CONNECTION_REMOTE_OPEN,
"on_connection_remote_open")
+ CONNECTION_REMOTE_CLOSE = EventType(PN_CONNECTION_REMOTE_CLOSE,
"on_connection_remote_close")
+ CONNECTION_FINAL = EventType(PN_CONNECTION_FINAL, "on_connection_final")
+
+ SESSION_INIT = EventType(PN_SESSION_INIT, "on_session_init")
+ SESSION_LOCAL_OPEN = EventType(PN_SESSION_LOCAL_OPEN,
"on_session_local_open")
+ SESSION_LOCAL_CLOSE = EventType(PN_SESSION_LOCAL_CLOSE,
"on_session_local_close")
+ SESSION_REMOTE_OPEN = EventType(PN_SESSION_REMOTE_OPEN,
"on_session_remote_open")
+ SESSION_REMOTE_CLOSE = EventType(PN_SESSION_REMOTE_CLOSE,
"on_session_remote_close")
+ SESSION_FINAL = EventType(PN_SESSION_FINAL, "on_session_final")
+
+ LINK_INIT = EventType(PN_LINK_INIT, "on_link_init")
+ LINK_LOCAL_OPEN = EventType(PN_LINK_LOCAL_OPEN, "on_link_local_open")
+ LINK_LOCAL_CLOSE = EventType(PN_LINK_LOCAL_CLOSE, "on_link_local_close")
+ LINK_LOCAL_DETACH = EventType(PN_LINK_LOCAL_DETACH, "on_link_local_detach")
+ LINK_REMOTE_OPEN = EventType(PN_LINK_REMOTE_OPEN, "on_link_remote_open")
+ LINK_REMOTE_CLOSE = EventType(PN_LINK_REMOTE_CLOSE, "on_link_remote_close")
+ LINK_REMOTE_DETACH = EventType(PN_LINK_REMOTE_DETACH,
"on_link_remote_detach")
+ LINK_FLOW = EventType(PN_LINK_FLOW, "on_link_flow")
+ LINK_FINAL = EventType(PN_LINK_FINAL, "on_link_final")
+
+ DELIVERY = EventType(PN_DELIVERY, "on_deli
svn commit: r1631544 - in /qpid/proton/trunk/examples/engine: ./ java/ java/src/ java/src/main/ java/src/main/java/ java/src/main/java/org/ java/src/main/java/org/apache/ java/src/main/java/org/apache
Author: rhs Date: Mon Oct 13 20:51:05 2014 New Revision: 1631544 URL: http://svn.apache.org/r1631544 Log: added engine examples for proton-j Added: qpid/proton/trunk/examples/engine/ qpid/proton/trunk/examples/engine/java/ qpid/proton/trunk/examples/engine/java/LICENSE qpid/proton/trunk/examples/engine/java/drain (with props) qpid/proton/trunk/examples/engine/java/pom.xml qpid/proton/trunk/examples/engine/java/server (with props) qpid/proton/trunk/examples/engine/java/spout (with props) qpid/proton/trunk/examples/engine/java/src/ qpid/proton/trunk/examples/engine/java/src/main/ qpid/proton/trunk/examples/engine/java/src/main/java/ qpid/proton/trunk/examples/engine/java/src/main/java/org/ qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/ qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/ qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/ qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/ qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Drain.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Driver.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/FlowController.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Handshaker.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Message.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Pool.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Router.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Server.java qpid/proton/trunk/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Spout.java Added: qpid/proton/trunk/examples/engine/java/LICENSE URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/engine/java/LICENSE?rev=1631544&view=auto == --- qpid/proton/trunk/examples/engine/java/LICENSE (added) +++ qpid/proton/trunk/examples/engine/java/LICENSE Mon Oct 13 20:51:05 2014 @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the
svn commit: r1631542 - in /qpid/proton/trunk: proton-c/bindings/python/ proton-c/include/proton/ proton-c/src/engine/ proton-c/src/events/ proton-c/src/messenger/ proton-j/src/main/java/org/apache/qpi
Author: rhs
Date: Mon Oct 13 20:50:51 2014
New Revision: 1631542
URL: http://svn.apache.org/r1631542
Log:
Renamed PN_{CONNECTION,SESSION,LINK}_{OPEN,CLOSE} to
PN_{CONNECTION,SESSION,LINK}_LOCAL_{OPEN,CLOSE}
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-c/include/proton/event.h
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/events/event.c
qpid/proton/trunk/proton-c/src/messenger/messenger.c
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/Event.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/LinkImpl.java
qpid/proton/trunk/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SessionImpl.java
qpid/proton/trunk/proton-j/src/main/resources/cengine.py
qpid/proton/trunk/tests/python/proton_tests/engine.py
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1631542&r1=1631541&r2=1631542&view=diff
==
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Oct 13 20:50:51
2014
@@ -3380,23 +3380,23 @@ class Event:
CONNECTION_INIT = PN_CONNECTION_INIT
CONNECTION_BOUND = PN_CONNECTION_BOUND
CONNECTION_UNBOUND = PN_CONNECTION_UNBOUND
- CONNECTION_OPEN = PN_CONNECTION_OPEN
- CONNECTION_CLOSE = PN_CONNECTION_CLOSE
+ CONNECTION_LOCAL_OPEN = PN_CONNECTION_LOCAL_OPEN
+ CONNECTION_LOCAL_CLOSE = PN_CONNECTION_LOCAL_CLOSE
CONNECTION_REMOTE_OPEN = PN_CONNECTION_REMOTE_OPEN
CONNECTION_REMOTE_CLOSE = PN_CONNECTION_REMOTE_CLOSE
CONNECTION_FINAL = PN_CONNECTION_FINAL
SESSION_INIT = PN_SESSION_INIT
- SESSION_OPEN = PN_SESSION_OPEN
- SESSION_CLOSE = PN_SESSION_CLOSE
+ SESSION_LOCAL_OPEN = PN_SESSION_LOCAL_OPEN
+ SESSION_LOCAL_CLOSE = PN_SESSION_LOCAL_CLOSE
SESSION_REMOTE_OPEN = PN_SESSION_REMOTE_OPEN
SESSION_REMOTE_CLOSE = PN_SESSION_REMOTE_CLOSE
SESSION_FINAL = PN_SESSION_FINAL
LINK_INIT = PN_LINK_INIT
- LINK_OPEN = PN_LINK_OPEN
- LINK_CLOSE = PN_LINK_CLOSE
- LINK_DETACH = PN_LINK_DETACH
+ LINK_LOCAL_OPEN = PN_LINK_LOCAL_OPEN
+ LINK_LOCAL_CLOSE = PN_LINK_LOCAL_CLOSE
+ LINK_LOCAL_DETACH = PN_LINK_LOCAL_DETACH
LINK_REMOTE_OPEN = PN_LINK_REMOTE_OPEN
LINK_REMOTE_CLOSE = PN_LINK_REMOTE_CLOSE
LINK_REMOTE_DETACH = PN_LINK_REMOTE_DETACH
Modified: qpid/proton/trunk/proton-c/include/proton/event.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/event.h?rev=1631542&r1=1631541&r2=1631542&view=diff
==
--- qpid/proton/trunk/proton-c/include/proton/event.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/event.h Mon Oct 13 20:50:51 2014
@@ -94,12 +94,14 @@ typedef enum {
PN_CONNECTION_INIT,
/**
- * The connection has been bound to a transport.
+ * The connection has been bound to a transport. This event is
+ * issued when the ::pn_transport_bind() operation is invoked.
*/
PN_CONNECTION_BOUND,
/**
- * The connection has been unbound from its transport.
+ * The connection has been unbound from its transport. This event is
+ * issued when the ::pn_transport_unbind() operation is invoked.
*/
PN_CONNECTION_UNBOUND,
@@ -107,7 +109,7 @@ typedef enum {
* The local connection endpoint has been closed. Events of this
* type point to the relevant connection.
*/
- PN_CONNECTION_OPEN,
+ PN_CONNECTION_LOCAL_OPEN,
/**
* The remote endpoint has opened the connection. Events of this
@@ -119,7 +121,7 @@ typedef enum {
* The local connection endpoint has been closed. Events of this
* type point to the relevant connection.
*/
- PN_CONNECTION_CLOSE,
+ PN_CONNECTION_LOCAL_CLOSE,
/**
* The remote endpoint has closed the connection. Events of this
@@ -144,7 +146,7 @@ typedef enum {
* The local session endpoint has been opened. Events of this type
* point ot the relevant session.
*/
- PN_SESSION_OPEN,
+ PN_SESSION_LOCAL_OPEN,
/**
* The remote endpoint has opened the session. Events of this type
@@ -156,7 +158,7 @@ typedef enum {
* The local session endpoint has been closed. Events of this type
* point ot the relevant session.
*/
- PN_SESSION_CLOSE,
+ PN_SESSION_LOCAL_CLOSE,
/**
* The remote endpoint has closed the session. Events of this type
@@ -181,7 +183,7 @@ typedef enum {
* The local link endpoint has been opened. Events of this type
* point ot the relevant link.
*/
- PN_LINK_OPEN,
+ PN_LINK_LOCAL_OPEN,
/**
* The remote endpoint has opened the link. Events of this type
@@ -193,7 +195,7 @@ typedef enum {
* The local
[1/2] git commit: Fix the test case.
Repository: qpid-jms
Updated Branches:
refs/heads/master f2900222e -> 95941245a
Fix the test case.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/fff5e965
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/fff5e965
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/fff5e965
Branch: refs/heads/master
Commit: fff5e965364be51d1cc9d2104789957a0d582181
Parents: f290022
Author: Timothy Bish
Authored: Mon Oct 13 16:04:10 2014 -0400
Committer: Timothy Bish
Committed: Mon Oct 13 16:04:10 2014 -0400
--
.../qpid/jms/message/JmsMessagePropertyIntercepterTest.java | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fff5e965/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index 4a54d06..69e2aed 100644
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -454,11 +454,6 @@ public class JmsMessagePropertyIntercepterTest {
fail("Should have thrown an exception for this call");
} catch (NumberFormatException e) {
}
-try {
-JmsMessagePropertyIntercepter.setProperty(message,
JMS_DELIVERY_MODE, null);
-fail("Should have thrown an exception for this call");
-} catch (NumberFormatException e) {
-}
}
@Test
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[2/2] git commit: Add some additional test cases to ensure errors are trapped. Remove unneeded check for null.
Add some additional test cases to ensure errors are trapped. Remove
unneeded check for null.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/95941245
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/95941245
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/95941245
Branch: refs/heads/master
Commit: 95941245ade051d81093ac5b3cc46651a31160de
Parents: fff5e96
Author: Timothy Bish
Authored: Mon Oct 13 16:31:10 2014 -0400
Committer: Timothy Bish
Committed: Mon Oct 13 16:31:10 2014 -0400
--
.../amqp/message/AmqpJmsBytesMessageFacade.java | 3 +-
.../message/AmqpJmsBytesMessageFacadeTest.java | 107 +++
2 files changed, 108 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/95941245/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
index 1fe5e26..8e9aca9 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
@@ -103,8 +103,7 @@ public class AmqpJmsBytesMessageFacade extends
AmqpJmsMessageFacade implements J
@Override
public boolean isEmpty() {
-Binary payload = getBinaryFromBody();
-return payload == null || payload.getLength() == 0;
+return getBinaryFromBody().getLength() == 0;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/95941245/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
index b07ba29..fd110ee 100644
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
@@ -20,13 +20,19 @@ import static
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_B
import static
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MSG_TYPE;
import static
org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.getSymbol;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.buffer.Unpooled;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map;
@@ -40,6 +46,7 @@ import
org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
import org.apache.qpid.proton.amqp.messaging.Section;
import org.apache.qpid.proton.message.Message;
import org.junit.Test;
+import org.mockito.Mockito;
/**
* Tests for class AmqpJmsBytesMessageFacade
@@ -266,6 +273,7 @@ public class AmqpJmsBytesMessageFacadeTest extends
AmqpJmsMessageTypesTestCase {
AmqpJmsBytesMessageFacade amqpBytesMessageFacade =
createReceivedBytesMessageFacade(createMockAmqpConsumer(), message);
assertEquals("Message reports unexpected length", length,
amqpBytesMessageFacade.getBodyLength());
+assertFalse(amqpBytesMessageFacade.isEmpty());
}
@Test
@@ -285,6 +293,7 @@ public class AmqpJmsBytesMessageFacadeTest extends
AmqpJmsMessageTypesTestCase {
AmqpJmsBytesMessageFacade amqpBytesMessageFacade =
createReceivedBytesMessageFacade(createMockAmqpConsumer(), message);
assertEquals("Message reports unexpected length", 0,
amqpBytesMessageFacade.getBodyLength());
+assertTrue(amqpBytesMessageFacade.isEmpty());
}
@Test
@@ -390,6 +399,24 @@ public class AmqpJmsBytesMessageFacadeTest extends
AmqpJmsMessageTypesTestCase {
}
}
+@Test
+public void testIsEmpty() throws Exception {
+Message message = Message.Factory.create();
+message.setBody(new Data(new Binary(new byte[1])));
+
[1/2] git commit: Finish work on refactoring the Amqp message property intercepter and updated tests to mock out the needed bits.
Repository: qpid-jms
Updated Branches:
refs/heads/master 94febc97f -> f2900222e
Finish work on refactoring the Amqp message property intercepter and
updated tests to mock out the needed bits.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cee0c341
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cee0c341
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cee0c341
Branch: refs/heads/master
Commit: cee0c3419666dfa69bb265eb175609db9c80d450
Parents: 94febc9
Author: Timothy Bish
Authored: Mon Oct 13 13:47:03 2014 -0400
Committer: Timothy Bish
Committed: Mon Oct 13 13:47:03 2014 -0400
--
.../jms/message/facade/JmsMessageFacade.java| 2 +-
.../amqp/message/AmqpJmsMessageFacade.java | 48 ++-
.../AmqpJmsMessagePropertyIntercepter.java | 7 +-
.../amqp/message/AmqpJmsMessageFacadeTest.java | 2 +-
.../AmqpJmsMessagePropertyIntercepterTest.java | 89 +---
5 files changed, 93 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cee0c341/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
--
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
index 20b912c..78130fb 100644
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
@@ -123,7 +123,7 @@ public interface JmsMessageFacade {
*
* @throws JMSException if an error occurs while accessing the message
properties.
*/
-void clearProperties();
+void clearProperties() throws JMSException;
/**
* Create a new instance and perform a deep copy of this object's
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cee0c341/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 ed4e0ae..c34ab87 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
@@ -169,11 +169,15 @@ public class AmqpJmsMessageFacade implements
JmsMessageFacade {
*/
@Override
public Set getPropertyNames() {
-Set properties =
AmqpJmsMessagePropertyIntercepter.getPropertyNames(this);
+return AmqpJmsMessagePropertyIntercepter.getPropertyNames(this);
+}
+
+public Set getApplicationPropertyNames(Set propertyNames) {
if (applicationPropertiesMap != null) {
-properties.addAll(applicationPropertiesMap.keySet());
+propertyNames.addAll(applicationPropertiesMap.keySet());
}
-return properties;
+
+return propertyNames;
}
@Override
@@ -247,9 +251,8 @@ public class AmqpJmsMessageFacade implements
JmsMessageFacade {
}
@Override
-public void clearProperties() {
-clearAllApplicationProperties();
-//TODO: should we clear some/all of those intercepted by
AmqpJmsMessagePropertyIntercepter?
+public void clearProperties() throws JMSException {
+AmqpJmsMessagePropertyIntercepter.clearProperties(this);
}
@Override
@@ -616,14 +619,20 @@ public class AmqpJmsMessageFacade implements
JmsMessageFacade {
* based on the expiration value when sending the underlying AMQP message.
A value of 0
* means to clear the ttl field rather than set it to anything.
*
- * @param ttl the value to use, in range 0 <= x <= 2^32 - 1
+ * @param ttl
+ *the value to use, in range 0 <= x <= 2^32 - 1
+ *
* @throws MessageFormatException
*/
-public void setAmqpTimeToLiveOverride(long ttl) throws
MessageFormatException {
-if (ttl >= 0 && ttl <= UINT_MAX) {
-userSpecifiedTTL = ttl;
+public void setAmqpTimeToLiveOverride(Long ttl) throws
MessageFormatException {
+if (ttl != null) {
+if (ttl >= 0 && ttl <= UINT_MAX) {
+userSpecifiedTTL = ttl;
+} else {
+throw new MessageFormatException(JMS_AMQP_TTL + " must be a
long with value in range 0 to 2^32 - 1");
+}
} else {
-throw new MessageFormatException(JMS_AMQP_T
[2/2] git commit: Add tests for new clear calls.
Add tests for new clear calls.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f2900222
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f2900222
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f2900222
Branch: refs/heads/master
Commit: f2900222ef4764c4809e7e912cbcebe84b89f09e
Parents: cee0c34
Author: Timothy Bish
Authored: Mon Oct 13 14:16:40 2014 -0400
Committer: Timothy Bish
Committed: Mon Oct 13 14:16:40 2014 -0400
--
.../JmsMessagePropertyIntercepterTest.java | 132 +++
1 file changed, 132 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f2900222/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
--
diff --git
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index c786622..4a54d06 100644
---
a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -164,6 +164,16 @@ public class JmsMessagePropertyIntercepterTest {
}
}
+@Test
+public void testJMSDestinationClearedWhenRequested() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+Mockito.when(message.getDestination()).thenReturn(null);
+JmsMessagePropertyIntercepter.clearProperties(message, true);
+Mockito.verify(message, Mockito.never()).setDestination(null);
+JmsMessagePropertyIntercepter.clearProperties(message, false);
+Mockito.verify(message).setDestination(null);
+}
+
//-- JMSReplyTo
--//
@Test
@@ -247,6 +257,15 @@ public class JmsMessagePropertyIntercepterTest {
}
}
+@Test
+public void testJMSRepltyToClearedWhenRequested() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.clearProperties(message, true);
+Mockito.verify(message, Mockito.never()).setReplyTo(null);
+JmsMessagePropertyIntercepter.clearProperties(message, false);
+Mockito.verify(message).setReplyTo(null);
+}
+
//-- JMSType
-//
@Test
@@ -326,6 +345,15 @@ public class JmsMessagePropertyIntercepterTest {
}
}
+@Test
+public void testJMSTypeClearedWhenRequested() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.clearProperties(message, true);
+Mockito.verify(message, Mockito.never()).setType(null);
+JmsMessagePropertyIntercepter.clearProperties(message, false);
+Mockito.verify(message).setType(null);
+}
+
//-- JMSDeliveryMode
-//
@Test
@@ -426,6 +454,20 @@ public class JmsMessagePropertyIntercepterTest {
fail("Should have thrown an exception for this call");
} catch (NumberFormatException e) {
}
+try {
+JmsMessagePropertyIntercepter.setProperty(message,
JMS_DELIVERY_MODE, null);
+fail("Should have thrown an exception for this call");
+} catch (NumberFormatException e) {
+}
+}
+
+@Test
+public void testJMSDeliveryModeClearedWhenRequested() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.clearProperties(message, true);
+Mockito.verify(message, Mockito.never()).setPersistent(true);
+JmsMessagePropertyIntercepter.clearProperties(message, false);
+Mockito.verify(message).setPersistent(true);
}
//-- JMSPriority -//
@@ -503,6 +545,15 @@ public class JmsMessagePropertyIntercepterTest {
}
}
+@Test
+public void testJMSPriorityClearedWhenRequested() throws JMSException {
+JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+JmsMessagePropertyIntercepter.clearProperties(message, true);
+Mockito.verify(message, Mockito.never()).setPriority(4);
+JmsMessagePropertyIntercepter.clearProperties(message, false);
+Mockito.verify(message).setPriority(4);
+}
+
//-- JMSMessageID -//
@Test
@@ -582,6 +633,15 @@ public class JmsMessageProper
svn commit: r1631460 - /qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml
Author: kwall Date: Mon Oct 13 16:32:20 2014 New Revision: 1631460 URL: http://svn.apache.org/r1631460 Log: QPID-6108: [Java Broker Documentation] Add statement that message compression is not yet supported on 1.0. Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml?rev=1631460&r1=1631459&r2=1631460&view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml Mon Oct 13 16:32:20 2014 @@ -22,19 +22,19 @@ Message Compression - The Java Broker supports message compression. This feature works in co-operation with - Qpid Clients implementing the same feature. + The Java Broker supportsMessage compression is not yet supported for the 1.0 +protocol. message compression. This feature works in co-operation with Qpid + Clients implementing the same feature. Once the feature is enabled (using Broker context variable broker.messageCompressionEnabled), the Broker will advertise support for the message compression feature to the client at connection time. This allows clients to opt to turn on message compression, allowing message payload sizes to be reduced. - If the Broker has connections from client who have message compression enabled and other who - do not, it will internally, on-tyhe-fly, decompress compressed messages when sending to clients - without support and conversely, compress uncomressed messages when sending to clients who support - it. + If the Broker has connections from clients who have message compression enabled and others who + do not, it will internally, on-the-fly, decompress compressed messages when sending to clients + without support and conversely, compress uncomressed messages when sending to clients who do. The Broker has a threshold below which it will not consider compressing a message, this is controlled by Broker content variable - (connection.messageCompressionThresholdSize). + (connection.messageCompressionThresholdSize) and expresses a size in bytes. This feature may have a beneficial effect on performance by: @@ -42,7 +42,8 @@ in the HA case, Broker to Broker, for replication purposes. - Reducing storage space when data is at rest within the Broker, both on disk and in memory. + Reducing storage space when data is at rest within the Broker, both on disk and in +memory. Of course, compression and decompression is computationally expensive. Turning on the feature - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631445 - in /qpid/trunk/qpid/doc/book/src: java-broker/ java-broker/management/managing/ jms-client-0-8/
Author: kwall Date: Mon Oct 13 15:52:28 2014 New Revision: 1631445 URL: http://svn.apache.org/r1631445 Log: QPID-6108: [Java Broker Documentation] Document message compression client/broker side. Also fixed up statements around ADDR support. Added: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/JMS-Client-Binding-URL.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/JMS-Client-Connection-URL.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/JMS-Client-JMS-Extensions.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/JMS-Client-System-Properties.xml qpid/trunk/qpid/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml Added: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml?rev=1631445&view=auto == --- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml (added) +++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml Mon Oct 13 15:52:28 2014 @@ -0,0 +1,52 @@ + + + + + Message Compression + The Java Broker supports message compression. This feature works in co-operation with + Qpid Clients implementing the same feature. + Once the feature is enabled (using Broker context variable + broker.messageCompressionEnabled), the Broker will advertise support for the + message compression feature to the client at connection time. This allows clients to opt to turn + on message compression, allowing message payload sizes to be reduced. + If the Broker has connections from client who have message compression enabled and other who + do not, it will internally, on-tyhe-fly, decompress compressed messages when sending to clients + without support and conversely, compress uncomressed messages when sending to clients who support + it. + The Broker has a threshold below which it will not consider compressing a message, this is + controlled by Broker content variable + (connection.messageCompressionThresholdSize). + This feature may have a beneficial effect on performance by: + + + Reducing the number of bytes transmitted over the wire, both between Client and Broker, and +in the HA case, Broker to Broker, for replication purposes. + + + Reducing storage space when data is at rest within the Broker, both on disk and in memory. + + + Of course, compression and decompression is computationally expensive. Turning on the feature + may have a negative impact on CPU utilization on Broker and/or Client. Also for small messages + payloads, message compression may increase the message size. It is recommended to test the feature + with representative data. + Modified: qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml?rev=1631445&r1=1631444&r2=1631445&view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/Java-Broker-Runtime.xml Mon Oct 13 15:52:28 2014 @@ -32,4 +32,5 @@ http://www.w3.org/2001/XInclude"; href="Java-Broker-Close-On-No-Route.xml"/> http://www.w3.org/2001/XInclude"; href="Java-Broker-Runtime-Flow-To-Disk.xml"/> http://www.w3.org/2001/XInclude"; href="Java-Broker-Runtime-Background-Recovery.xml"/> + http://www.w3.org/2001/XInclude"; href="Java-Broker-Runtime-Message-Compression.xml"/> Modified: qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml?rev=1631445&r1=1631444&r2=1631445&view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml Mon Oct 13 15:52:28 2014 @@ -28,7 +28,8 @@ The Broker can only be managed via the HTTP management channel. Attributes - + + Name the Broker. This helps distinguish between Brokers in environments that have many. @@ -42,27 +43,38 @@ Heartbeating. Enables heartbeats between Broker and Clients. Heartbeats help discover severed TCP/IP connections in
svn commit: r1631436 - in /qpid/trunk/qpid/java/bdbstore/src/main/java/resources: js/qpid/management/virtualhostnode/bdb_ha/show.js virtualhostnode/bdb_ha/edit.html
Author: orudyy
Date: Mon Oct 13 15:12:49 2014
New Revision: 1631436
URL: http://svn.apache.org/r1631436
Log:
QPID-6149: Use better names for the domain of BDB HA node priority
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js?rev=1631436&r1=1631435&r2=1631436&view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/show.js
Mon Oct 13 15:12:49 2014
@@ -31,7 +31,7 @@ define(["dojo/_base/xhr",
"dojo/domReady!"],
function (xhr, connect, entities, query, json, registry, EnhancedGrid,
UpdatableStore, UserPreferences, util)
{
-var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'Normal', '_3':
'High'};
+var priorityNames = {'_0': 'Never', '_1': 'Default', '_2': 'High', '_3':
'Highest'};
var nodeFields = ["storePath", "groupName", "role", "address",
"designatedPrimary", "priority", "quorumOverride"];
function findNode(nodeClass, containerNode)
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html?rev=1631436&r1=1631435&r2=1631436&view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
Mon Oct 13 15:12:49 2014
@@ -113,8 +113,8 @@
data-dojo-props="data: [
{id: '0', name: 'Never'},
{id: '1', name:
'Default', selected: '1'},
- {id: '2', name:
'Normal'},
- {id: '3', name: 'High'}
+ {id: '2', name: 'High'},
+ {id: '3', name:
'Highest'}
]">
svn commit: r1631396 - /qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
Author: pmoravec
Date: Mon Oct 13 14:00:56 2014
New Revision: 1631396
URL: http://svn.apache.org/r1631396
Log:
QPID-6148: purging TTL expired messages via purge task should not increase
acquires counters
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1631396&r1=1631395&r2=1631396&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Mon Oct 13 14:00:56 2014
@@ -646,10 +646,8 @@ void Queue::purgeExpired(sys::Duration l
// Report the count of discarded-by-ttl messages
//
if (mgmtObject && count) {
-mgmtObject->inc_acquires(count);
mgmtObject->inc_discardsTtl(count);
if (brokerMgmtObject) {
-brokerMgmtObject->inc_acquires(count);
brokerMgmtObject->inc_discardsTtl(count);
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631388 - in /qpid/trunk/qpid/java/perftests: etc/testdefs/QueueTypes.json pom.xml
Author: macbean
Date: Mon Oct 13 13:28:30 2014
New Revision: 1631388
URL: http://svn.apache.org/r1631388
Log:
QPID-6138: [Java Perf Tests] Update perf test profiles replacing
persistent/auto-ack with persistent/transacted - queue type change
Modified:
qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
qpid/trunk/qpid/java/perftests/pom.xml
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json?rev=1631388&r1=1631387&r2=1631388&view=diff
==
--- qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/QueueTypes.json Mon Oct 13
13:28:30 2014
@@ -16029,7 +16029,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16054,7 +16054,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -16087,7 +16087,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16111,7 +16111,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -16154,7 +16154,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16179,7 +16179,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
Modified: qpid/trunk/qpid/java/perftests/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1631388&r1=1631387&r2=1631388&view=diff
==
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/pom.xml Mon Oct 13 13:28:30 2014
@@ -179,7 +179,10 @@
- qpid.amqp0-91
+
log4j.configurationfile:log4j.properties
+
+
+ qpid.amqp.version0-91
qpid.dest_syntaxBURL
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631383 - /qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
Author: aconway Date: Mon Oct 13 13:19:20 2014 New Revision: 1631383 URL: http://svn.apache.org/r1631383 Log: NO-JIRA: Fix duplicate id "ha-broker-options" in broker docbook source. Fixed cut and paste error. Modified: qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml Modified: qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml?rev=1631383&r1=1631382&r2=1631383&view=diff == --- qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml (original) +++ qpid/trunk/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml Mon Oct 13 13:19:20 2014 @@ -659,7 +659,7 @@ under the License. Broker options affecting federation The following broker options affect federation: - + Broker Options for Federation - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631360 - in /qpid/trunk/qpid/cpp/src/qpid/linearstore: JournalImpl.cpp management-schema.xml
Author: pmoravec
Date: Mon Oct 13 12:24:26 2014
New Revision: 1631360
URL: http://svn.apache.org/r1631360
Log:
QPID-6147: missing journal id in "trace Mgmt create journal." log
Modified:
qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp?rev=1631360&r1=1631359&r2=1631360&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp Mon Oct 13
12:24:26 2014
@@ -109,9 +109,8 @@ JournalImpl::initManagement(::qpid::mana
if (_agent != 0)
{
_mgmtObject =
::qmf::org::apache::qpid::linearstore::Journal::shared_ptr (
-new ::qmf::org::apache::qpid::linearstore::Journal(_agent, this));
+new ::qmf::org::apache::qpid::linearstore::Journal(_agent, this,
_jid));
-_mgmtObject->set_name(_jid);
_mgmtObject->set_directory(_jdir.dirname());
//_mgmtObject->set_baseFileName(_base_filename);
//_mgmtObject->set_readPageSize(JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE);
Modified: qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml?rev=1631360&r1=1631359&r2=1631360&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml (original)
+++ qpid/trunk/qpid/cpp/src/qpid/linearstore/management-schema.xml Mon Oct 13
12:24:26 2014
@@ -41,7 +41,7 @@
-
+
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1631345 - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: ./ amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ bdbstore/src/main/java/org/apache/qpid/server/store
Author: rgodfrey
Date: Mon Oct 13 10:52:27 2014
New Revision: 1631345
URL: http://svn.apache.org/r1631345
Log:
Merge from trunk
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/ (props changed)
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Propchange: qpid/branches/QPID-6125-ProtocolRefactoring/java/
--
Merged /qpid/trunk/qpid/java:r1630747-1631344
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java?rev=1631345&r1=1631344&r2=1631345&view=diff
==
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
Mon Oct 13 10:52:27 2014
@@ -300,6 +300,12 @@ public class MessageConsumerImpl impleme
}
}
+Message receiveRecoveredMessage()
+{
+return _replaymessages.isEmpty() ? null : _replaymessages.remove(0);
+
+}
+
Message receive0(final long timeout)
{
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java?rev=1631345&r1=1631344&r2=1631345&view=diff
==
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/SessionImpl.java
Mon Oct 13 10:52:27 2014
@@ -922,7 +922,15 @@ public class SessionImpl implements Sess
else
{
consumer = _messageConsumerList.remove(0);
-msg = consumer.receive0(0L);
+msg = consumer.receiveRecoveredMessage();
+if(msg == null)
+{
+msg = consumer.receive0(0L);
+}
+else
+{
+reco
svn commit: r1631344 - in /qpid/branches/QPID-6125-ProtocolRefactoring/java: broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ common/src/main/java/org/apache/qpid/f
Author: rgodfrey
Date: Mon Oct 13 10:50:37 2014
New Revision: 1631344
URL: http://svn.apache.org/r1631344
Log:
Add logging
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/BrokerDecoder.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1631344&r1=1631343&r2=1631344&view=diff
==
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Mon Oct 13 10:50:37 2014
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.protocol.v0_8;
+import static org.apache.qpid.transport.util.Functions.hex;
+
import java.nio.ByteBuffer;
import java.security.AccessControlException;
import java.security.PrivilegedAction;
@@ -1855,6 +1857,15 @@ public class AMQChannel
final boolean passive,
final boolean active, final boolean
write, final boolean read)
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] AccessRequest[" +" realm:
" + realm +
+ " exclusive: " + exclusive +
+ " passive: " + passive +
+ " active: " + active +
+ " write: " + write + " read: " + read + " ]");
+}
+
MethodRegistry methodRegistry = _connection.getMethodRegistry();
if (ProtocolVersion.v0_91.equals(_connection.getProtocolVersion()))
@@ -1876,12 +1887,23 @@ public class AMQChannel
@Override
public void receiveBasicAck(final long deliveryTag, final boolean multiple)
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] BasicAck[" +" deliveryTag:
" + deliveryTag + " multiple: " + multiple + " ]");
+}
+
acknowledgeMessage(deliveryTag, multiple);
}
@Override
public void receiveBasicCancel(final AMQShortString consumerTag, final
boolean nowait)
{
+
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] BasicCancel[" +"
consumerTag: " + consumerTag + " noWait: " + nowait + " ]");
+}
+
unsubscribeConsumer(consumerTag);
if (!nowait)
{
@@ -1899,6 +1921,16 @@ public class AMQChannel
final boolean noAck,
final boolean exclusive, final boolean
nowait, final FieldTable arguments)
{
+
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] BasicConsume[" +" queue: "
+ queue +
+ " consumerTag: " + consumerTag +
+ " noLocal: " + noLocal +
+ " noAck: " + noAck +
+ " exclusive: " + exclusive + " nowait: " + nowait +
" arguments: " + arguments + " ]");
+}
+
AMQShortString consumerTag1 = consumerTag;
VirtualHostImpl vHost = _connection.getVirtualHost();
sync();
@@ -2020,6 +2052,11 @@ public class AMQChannel
@Override
public void receiveBasicGet(final AMQShortString queueName, final boolean
noAck)
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] BasicGet[" +" queue: " +
queueName + " noAck: " + noAck + " ]");
+}
+
VirtualHostImpl vHost = _connection.getVirtualHost();
sync();
AMQQueue queue = queueName == null ? getDefaultQueue() :
vHost.getQueue(queueName.toString());
@@ -2080,6 +2117,14 @@ public class AMQChannel
final boolean mandatory,
final boolean immediate)
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug("RECV[" + _channelId + "] BasicPublish[" +"
exchange: " + exchangeName +
+
svn commit: r1631320 - /qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Author: rgodfrey
Date: Mon Oct 13 09:06:11 2014
New Revision: 1631320
URL: http://svn.apache.org/r1631320
Log:
Fix the invalid channel proxy case
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1631320&r1=1631319&r2=1631320&view=diff
==
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Mon Oct 13 09:06:11 2014
@@ -1108,12 +1108,11 @@ public class AMQProtocolEngine implement
{
_logger.error("Exception caught in " + this + ", closing
connection explicitly: " + throwable, throwable);
-
-ConnectionCloseBody closeBody =
_methodRegistry.createConnectionCloseBody(200,
+ConnectionCloseBody closeBody =
_methodRegistry.createConnectionCloseBody(AMQConstant.INTERNAL_ERROR.getCode(),
AMQShortString.validValueOf(
throwable.getMessage()),
-
0,
-
0);
+
_currentClassId,
+
_currentMethodId);
writeFrame(closeBody.generateFrame(0));
@@ -1790,8 +1789,17 @@ public class AMQProtocolEngine implement
public Object invoke(final Object proxy, final Method
method, final Object[] args)
throws Throwable
{
-closeConnection(AMQConstant.CHANNEL_ERROR,
"Unknown channel id: " + channelId, channelId);
-
+if(method.getName().startsWith("receive"))
+{
+closeConnection(AMQConstant.CHANNEL_ERROR,
+"Unknown channel id: " +
channelId,
+channelId);
+return null;
+}
+else
if(method.getName().equals("ignoreAllButCloseOk"))
+{
+return false;
+}
return null;
}
});
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
