Author: hadrian
Date: Mon May 30 22:41:11 2011
New Revision: 1129417
URL: http://svn.apache.org/viewvc?rev=1129417&view=rev
Log:
CAMEL-3862. Port fixes to the 2.7.x branch
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:41:11 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1095405
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405
Modified:
camel/branches/camel-2.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java?rev=1129417&r1=1129416&r2=1129417&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheProducer.java
Mon May 30 22:41:11 2011
@@ -104,13 +104,13 @@ public class CacheProducer extends Defau
LOG.debug("Adding an element with key " + key + " into the
Cache");
}
element = createElementFromBody(exchange,
CacheConstants.CACHE_OPERATION_ADD);
- cache.put(new Element(key, element), true);
+ cache.put(new Element(key, element));
} else if
(operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_UPDATE)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Updating an element with key " + key + " into the
Cache");
}
element = createElementFromBody(exchange,
CacheConstants.CACHE_OPERATION_UPDATE);
- cache.put(new Element(key, element), true);
+ cache.put(new Element(key, element));
} else if
(operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_DELETEALL)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Deleting All elements from the Cache");
@@ -120,7 +120,7 @@ public class CacheProducer extends Defau
if (LOG.isDebugEnabled()) {
LOG.debug("Deleting an element with key " + key + " into the
Cache");
}
- cache.remove(key, true);
+ cache.remove(key);
} else if
(operation.equalsIgnoreCase(CacheConstants.CACHE_OPERATION_GET)) {
if (LOG.isDebugEnabled()) {
LOG.debug("Quering an element with key " + key + " from the
Cache");
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:41:11 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1095405
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405
