Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 25528 invoked from network); 29 Nov 2007 08:43:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Nov 2007 08:43:04 -0000 Received: (qmail 11402 invoked by uid 500); 29 Nov 2007 08:42:50 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 11348 invoked by uid 500); 29 Nov 2007 08:42:50 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 11334 invoked by uid 99); 29 Nov 2007 08:42:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2007 00:42:50 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2007 08:42:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF5CE1A983A; Thu, 29 Nov 2007 00:42:40 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r599337 - in /incubator/cxf/trunk: rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ systests/src/test/java/org/apache/cxf/systest/interceptor/ Date: Thu, 29 Nov 2007 08:42:40 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071129084240.BF5CE1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Thu Nov 29 00:42:32 2007 New Revision: 599337 URL: http://svn.apache.org/viewvc?rev=599337&view=rev Log: CXF-1191 * Fix the NEP, enable the tests disabled in the last commit Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=599337&r1=599336&r2=599337&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Thu Nov 29 00:42:32 2007 @@ -152,8 +152,10 @@ * @return true iff the current messaging role is that of requestor */ public static boolean isRequestor(Message message) { - Boolean requestor = (Boolean)message.get(REQUESTOR_ROLE); - return requestor != null && requestor.booleanValue(); + if (message.get(REQUESTOR_ROLE) instanceof Boolean) { + return ((Boolean)message.get(REQUESTOR_ROLE)).booleanValue(); + } + return false; } /** Modified: incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=599337&r1=599336&r2=599337&view=diff ============================================================================== --- incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java (original) +++ incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java Thu Nov 29 00:42:32 2007 @@ -420,6 +420,9 @@ } private boolean isSameFault(final FaultInfo faultInfo, String faultName) { + if (faultInfo.getName() == null || faultName == null) { + return false; + } String faultInfoName = faultInfo.getName().getLocalPart(); return faultInfoName.equals(faultName) || faultInfoName.equals(StringUtils.uncapitalize(faultName)); Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java?rev=599337&r1=599336&r2=599337&view=diff ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java Thu Nov 29 00:42:32 2007 @@ -281,12 +281,8 @@ } catch (WebServiceException ex) { Throwable cause = ex.getCause(); SoapFault sf = (SoapFault)cause; - if (!expectedMsg.equals(sf.getReason())) { - // TODO, the FromJava WS-A action is not supported yet - } else { - assertEquals(expectedMsg, sf.getReason()); - assertEquals(SOAP_FAULT_CODE, sf.getFaultCode()); - } + assertEquals(expectedMsg, sf.getReason()); + assertEquals(SOAP_FAULT_CODE, sf.getFaultCode()); } }