geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1170413 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java
Date Wed, 14 Sep 2011 02:02:44 GMT
Author: xuhaihong
Date: Wed Sep 14 02:02:43 2011
New Revision: 1170413

URL: http://svn.apache.org/viewvc?rev=1170413&view=rev
Log:
GERONIMO-6104 Support absolute java.net.URL in externalForm in HandlerChain annotation

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java?rev=1170413&r1=1170412&r2=1170413&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainFinder.java
Wed Sep 14 02:02:43 2011
@@ -64,8 +64,13 @@ public class AnnotationHandlerChainFinde
                 HandlerChains handlerChainsType;
                 InputStream in = null;
                 try {
+                    if (handlerFileURL == null) {
+                        handlerFileURL = new URL(hcAnn.getFileName());
+                    }
                     in = handlerFileURL.openStream();
                     handlerChainsType = (HandlerChains) JaxbJavaee.unmarshalHandlerChains(HandlerChains.class,
in);
+                } catch (Exception e) {
+                    throw new WebServiceException("Could not read the chain info from " +
hcAnn.getFileName(), e);
                 } finally {
                     IOUtils.close(in);
                 }
@@ -76,6 +81,8 @@ public class AnnotationHandlerChainFinde
 
                 handlerChainsInfo = handlerChainsInfoBuilder.build(handlerChainsType);
 
+            } catch (WebServiceException e) {
+                throw e;
             } catch (Exception e) {
                 throw new WebServiceException("Chain not specified", e);
             }



Mime
View raw message