Return-Path: <commits-return-43266-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id ED61A200B73
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 29 Aug 2016 12:09:10 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id EBF8B160AB8; Mon, 29 Aug 2016 10:09:10 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3E166160AA7
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 29 Aug 2016 12:09:10 +0200 (CEST)
Received: (qmail 44963 invoked by uid 500); 29 Aug 2016 10:09:09 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 44954 invoked by uid 99); 29 Aug 2016 10:09:09 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2016 10:09:09 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 13C0BE09B3; Mon, 29 Aug 2016 10:09:09 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ffang@apache.org
To: commits@cxf.apache.org
Message-Id: <0715fb48abc34dd4a32bc275bad19f74@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf git commit: [CXF-7029]HttpAuthenticationFaultHandler cause
 java.lang.IllegalStateException: WRITER
Date: Mon, 29 Aug 2016 10:09:09 +0000 (UTC)
archived-at: Mon, 29 Aug 2016 10:09:11 -0000

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4484cce18 -> 914115fbd


[CXF-7029]HttpAuthenticationFaultHandler cause java.lang.IllegalStateException: WRITER

(cherry picked from commit cacfe5c39b1c28c61d8a5ccb1754f5b89109c0b7)
(cherry picked from commit 8c6b85a005984604360ba8c770a0850b67e83955)


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

Branch: refs/heads/3.0.x-fixes
Commit: 914115fbd3deb2552f8a3b7f5cd5c5cac81fa3a3
Parents: 4484cce
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Mon Aug 29 18:07:20 2016 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Mon Aug 29 18:08:53 2016 +0800

----------------------------------------------------------------------
 .../cxf/transport/http/HttpAuthenticationFaultHandler.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/914115fb/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthenticationFaultHandler.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthenticationFaultHandler.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthenticationFaultHandler.java
index 3167669..3dc2ac1 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthenticationFaultHandler.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpAuthenticationFaultHandler.java
@@ -56,8 +56,9 @@ public class HttpAuthenticationFaultHandler extends AbstractPhaseInterceptor<Mes
             resp.setHeader("WWW-Authenticate", authenticationType + " realm=\"" + realm + "\"");
             resp.setContentType("text/plain");
             try {
-                resp.getWriter().write(ex.getMessage());
-                resp.getWriter().flush();
+                resp.getOutputStream().write(ex.getMessage().getBytes());
+                resp.getOutputStream().flush();
+                message.getInterceptorChain().setFaultObserver(null); //avoid return soap fault
                 message.getInterceptorChain().abort();
             } catch (IOException e) {
                 // TODO
@@ -72,4 +73,5 @@ public class HttpAuthenticationFaultHandler extends AbstractPhaseInterceptor<Mes
     public void setRealm(String realm) {
         this.realm = realm;
     }
+    
 }