Author: davsclaus
Date: Tue Apr 28 05:54:16 2009
New Revision: 769255
URL: http://svn.apache.org/viewvc?rev=769255&view=rev
Log:
CAMEL-1543: Fixed removeHeader to also remove the header from the JMS Message
object.
Added:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
(with props)
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
- copied, changed from r769251,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Modified:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=769255&r1=769254&r2=769255&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Tue Apr 28 05:54:16 2009
@@ -26,6 +26,7 @@
import javax.jms.Topic;
import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -132,6 +133,24 @@
}
@Override
+ public Object removeHeader(String name) {
+ Object answer = super.removeHeader(name);
+
+ if (jmsMessage != null && !name.startsWith("JMS")) {
+ try {
+ // also remove header from the JMS message
+ if (jmsMessage.propertyExists(name)) {
+ answer = JmsMessageHelper.removeJmsProperty(jmsMessage,
name);
+ }
+ } catch (JMSException e) {
+ throw new RuntimeCamelException(name, e);
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
public JmsMessage newInstance() {
return new JmsMessage();
}
Added:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java?rev=769255&view=auto
==============================================================================
---
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
(added)
+++
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
Tue Apr 28 05:54:16 2009
@@ -0,0 +1,75 @@
+/**
+ * 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.camel.component.jms;
+
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+/**
+ * Utility class for {...@link javax.jms.Message}.
+ *
+ * @version $Revision$
+ */
+public final class JmsMessageHelper {
+
+ private JmsMessageHelper() {
+ }
+
+ /**
+ * Removes the property from the JMS message.
+ *
+ * @param jmsMessage the JMS message
+ * @param name name of the property to remove
+ * @return the old value of the property or <tt>null</tt> if not exists
+ * @throws javax.jms.JMSException can be thrown
+ */
+ public static Object removeJmsProperty(Message jmsMessage, String name)
throws JMSException {
+ // check if the property exists
+ if (!jmsMessage.propertyExists(name)) {
+ return null;
+ }
+
+ Object answer = null;
+
+ // store the properties we want to keep in a temporary map
+ // as the JMS API is a bit strict as we are not allowed to
+ // clear a single property, but must clear them all and redo
+ // the properties
+ Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Enumeration en = jmsMessage.getPropertyNames();
+ while (en.hasMoreElements()) {
+ String key = (String) en.nextElement();
+ if (name.equals(key)) {
+ answer = key;
+ } else {
+ map.put(key, jmsMessage.getObjectProperty(key));
+ }
+ }
+
+ // redo the properties to keep
+ jmsMessage.clearProperties();
+ for (String key : map.keySet()) {
+ jmsMessage.setObjectProperty(key, map.get(key));
+ }
+
+ return answer;
+ }
+
+}
Propchange:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
(from r769251,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java?p2=camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java&r1=769251&r2=769255&rev=769255&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
Tue Apr 28 05:54:16 2009
@@ -38,11 +38,11 @@
// should not receive the foo header
mock.expectedHeaderReceived("foo", null);
// but only the bar header
- mock.expectedHeaderReceived("bar", 123);
+ mock.expectedHeaderReceived("bar", "123");
Map headers = new HashMap();
headers.put("foo", "cheese");
- headers.put("bar", 123);
+ headers.put("bar", "123");
template.sendBodyAndHeaders("activemq:queue:foo", "Hello World",
headers);
