Author: dkulp
Date: Wed Dec 1 20:03:35 2010
New Revision: 1041144
URL: http://svn.apache.org/viewvc?rev=1041144&view=rev
Log:
Merged revisions 1041143 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1041143 | dkulp | 2010-12-01 14:55:10 -0500 (Wed, 01 Dec 2010) | 2 lines
Accidentally committed something that wasn't ready (and untested). Fix
the tests.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1041144&r1=1041143&r2=1041144&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Wed Dec 1 20:03:35 2010
@@ -19,6 +19,7 @@
package org.apache.cxf.phase;
+import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -238,8 +239,11 @@ public class PhaseInterceptorChain imple
Message oldMessage = CURRENT_MESSAGE.get();
try {
CURRENT_MESSAGE.set(message);
- if (oldMessage != null && !message.containsKey(PREVIOUS_MESSAGE)) {
- message.put(PREVIOUS_MESSAGE, oldMessage);
+ if (oldMessage != null
+ && !message.containsKey(PREVIOUS_MESSAGE)
+ && message != oldMessage
+ && message.getExchange() != oldMessage.getExchange()) {
+ message.put(PREVIOUS_MESSAGE, new
WeakReference<Message>(oldMessage));
}
while (state == State.EXECUTING && iterator.hasNext()) {
try {
