You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/12 22:57:02 UTC
svn commit: r594312 - in /incubator/cxf/branches/2.0.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
Author: dkulp
Date: Mon Nov 12 13:57:01 2007
New Revision: 594312
URL: http://svn.apache.org/viewvc?rev=594312&view=rev
Log:
Merged revisions 594302 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r594302 | dkulp | 2007-11-12 16:24:56 -0500 (Mon, 12 Nov 2007) | 2 lines
Fix logging interceptors to not store EVERYTHING logged to them and also be thread safe.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=594312&r1=594311&r2=594312&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java Mon Nov 12 13:57:01 2007
@@ -37,7 +37,6 @@
public class LoggingInInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(LoggingInInterceptor.class);
- private final LoggingMessage buffer = new LoggingMessage("Inbound Message\n----------------------------");
private int limit = 100 * 1024;
private boolean enabled;
@@ -56,10 +55,6 @@
this.enabled = b;
}
- public LoggingMessage getBuffer() {
- return this.buffer;
- }
-
public void setLimit(int lim) {
limit = lim;
}
@@ -75,6 +70,9 @@
}
private void logging(Message message) throws Fault {
+ final LoggingMessage buffer = new LoggingMessage("Inbound Message\n----------------------------");
+
+
String encoding = (String)message.get(Message.ENCODING);
if (encoding != null) {
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java?rev=594312&r1=594311&r2=594312&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java Mon Nov 12 13:57:01 2007
@@ -37,7 +37,6 @@
public class LoggingOutInterceptor extends AbstractPhaseInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(LoggingOutInterceptor.class);
- private final LoggingMessage buffer = new LoggingMessage("Outbound Message\n---------------------------");
private int limit = 100 * 1024;
private boolean enabled;
@@ -64,10 +63,6 @@
return limit;
}
- public LoggingMessage getBuffer() {
- return this.buffer;
- }
-
public void handleMessage(Message message) throws Fault {
final OutputStream os = message.getContent(OutputStream.class);
if (os == null) {
@@ -89,6 +84,8 @@
}
public void onClose(CachedOutputStream cos) {
+ final LoggingMessage buffer = new LoggingMessage("Outbound Message\n---------------------------");
+
if (cos.getTempFile() == null) {
//buffer.append("Outbound Message:\n");
if (cos.size() > limit) {