svn commit: r225636 - /webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java

[sc...@apache.org]

Author: scamp
Date: Wed Jul 27 14:09:09 2005
New Revision: 225636

URL: http://svn.apache.org/viewcvs?rev=225636&view=rev
Log: (empty)

Modified:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=225636&r1=225635&r2=225636&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Wed Jul 27 14:09:09 2005
@@ -307,9 +307,8 @@
         if(resource != null)
         {
             if (resource.getEndpointReference() == null)
-            {
-                String endpointUrl = JaxRpcPlatform.getJaxRpcPlatform().getEndpointUrl(getBaseWebappUrl(),getServiceName().getLocalPart());
-                resource.setEndpointReference(getEndpointReference(endpointUrl, resourceId, getNamespaceVersionHolder().getAddressingNamespace()));
+            {                
+                resource.setEndpointReference(getEndpointReference(resourceId));
             }
         }
 
@@ -696,14 +695,16 @@
      * <p/>
      * If the resourceKey is not equal to null ( not a singleton ), the reference properties will contain the key.
      *
-     * @param endpointAddress the endpoint url for the service
      * @param resourceId      the resource identifier, or null if the resource is a singleton
-     * @param wsAddressingURI the namespace URI of the preferred WS-Addressing version
      *
      * @return an EndpointReference (EPR) for the resource
      */
-    public EndpointReference getEndpointReference( String endpointAddress, Object resourceId, String wsAddressingURI )
+    public EndpointReference getEndpointReference( Object resourceId )
     {
+        String endpointAddress = JaxRpcPlatform.getJaxRpcPlatform().getEndpointUrl(getBaseWebappUrl(),getServiceName().getLocalPart());
+        String wsAddressingURI = getNamespaceVersionHolder().getAddressingNamespace();
+
+
         XmlBeansEndpointReference xmlBeansEndpointReference = new XmlBeansEndpointReference( endpointAddress,
                 wsAddressingURI );
         xmlBeansEndpointReference.setResourceIdentifierReferenceParameterName(