geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r524698 - /geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
Date Sun, 01 Apr 2007 22:51:52 GMT
Author: gawor
Date: Sun Apr  1 15:51:50 2007
New Revision: 524698

URL: http://svn.apache.org/viewvc?view=rev&rev=524698
Log:
prefer service-ref-type service class (if set)

Modified:
    geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java

Modified: geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java?view=diff&rev=524698&r1=524697&r2=524698
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/client/JAXWSServiceReference.java
Sun Apr  1 15:51:50 2007
@@ -114,8 +114,14 @@
     public Object getContent() throws NamingException {
         Service instance = null;
         URL wsdlURL = getWsdlURL();
+        
         Class serviceClass = loadClass(this.serviceClassName);
-
+        Class referenceClass = getReferenceClass();              
+        
+        if (referenceClass != null && Service.class.isAssignableFrom(referenceClass))
{
+            serviceClass = referenceClass;
+        }
+                
         if (Service.class.equals(serviceClass)) {
             serviceClass = GenericService.class;
         }
@@ -127,7 +133,6 @@
             instance.setHandlerResolver(handlerResolver);
         }
 
-        Class referenceClass = getReferenceClass();
         if (referenceClass != null && !Service.class.isAssignableFrom(referenceClass))
{
             // do port lookup
             return instance.getPort(referenceClass);



Mime
View raw message