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))) {