Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 81587 invoked from network); 11 Oct 2007 17:28:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Oct 2007 17:28:12 -0000 Received: (qmail 35775 invoked by uid 500); 11 Oct 2007 17:27:43 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 35713 invoked by uid 500); 11 Oct 2007 17:27:43 -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 35702 invoked by uid 99); 11 Oct 2007 17:27:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2007 10:27:43 -0700 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, 11 Oct 2007 17:27:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 83D1B1A9832; Thu, 11 Oct 2007 10:27:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r583890 - in /incubator/cxf/branches/2.0.x-fixes: ./ integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Date: Thu, 11 Oct 2007 17:27:04 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071011172704.83D1B1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Oct 11 10:27:03 2007 New Revision: 583890 URL: http://svn.apache.org/viewvc?rev=583890&view=rev Log: Merged revisions 583722 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r583722 | ningjiang | 2007-10-11 03:51:04 -0400 (Thu, 11 Oct 2007) | 1 line CXF-1093 Fixed a check style error of my last commit ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=583890&r1=583889&r2=583890&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java (original) +++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Thu Oct 11 10:27:03 2007 @@ -85,7 +85,7 @@ String baseAddress = isNotNull(getEjbServantBaseURL()) ? getEjbServantBaseURL() : getDefaultEJBServantBaseURL(); - String address = (baseAddress + "/" + config.getJNDIName()); + String address = baseAddress + "/" + config.getJNDIName(); factory.setAddress(address); if (address.length() >= 5 && HTTPS_PREFIX.equalsIgnoreCase(address.substring(0, 5))) {