cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6770] Fixing NPE
Date Wed, 10 Feb 2016 12:06:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master cf492753c -> 351364f7f


[CXF-6770] Fixing NPE


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/351364f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/351364f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/351364f7

Branch: refs/heads/master
Commit: 351364f7f32970754af4583ffc0626b177b023e9
Parents: cf49275
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Feb 10 12:05:57 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Feb 10 12:05:57 2016 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/351364f7/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
index bb99ff2..db42fd4 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
@@ -66,6 +66,7 @@ public class PrettyLoggingFilter implements LogEventSender {
             // that can occur when we set a limit and cur the rest off
             XMLStreamWriter xwriter = StaxUtils.createXMLStreamWriter(swriter);
             xwriter = new PrettyPrintXMLStreamWriter(xwriter, 2);
+            encoding = encoding == null ? "UTF-8" : encoding;
             InputStream in = new ByteArrayInputStream(message.getBytes(encoding));
             try {
                 StaxUtils.copy(new StreamSource(in), xwriter);


Mime
View raw message