cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1401436 - /cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
Date Tue, 23 Oct 2012 20:19:13 GMT
Author: dkulp
Date: Tue Oct 23 20:19:13 2012
New Revision: 1401436

URL: http://svn.apache.org/viewvc?rev=1401436&view=rev
Log:
Merged revisions 1399007 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1399007 | asoldano | 2012-10-16 17:55:05 -0400 (Tue, 16 Oct 2012) | 2 lines

  [CXF-4576] Output a warn log when failing parsing policy attachments

........

Modified:
    cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java

Modified: cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java?rev=1401436&r1=1401435&r2=1401436&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
Tue Oct 23 20:19:13 2012
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.wsdl.extensions.UnknownExtensibilityElement;
 import javax.xml.stream.XMLStreamException;
@@ -39,6 +41,7 @@ import org.xml.sax.InputSource;
 import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.Policies;
 import org.apache.cxf.annotations.Policy;
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.ConfiguredBeanLocator;
 import org.apache.cxf.endpoint.Endpoint;
@@ -64,6 +67,7 @@ import org.apache.neethi.Constants;
  * 
  */
 public class PolicyAnnotationListener implements FactoryBeanListener {
+    private static final Logger LOG = LogUtils.getL7dLogger(PolicyAnnotationListener.class);
     private static final String EXTRA_POLICIES = PolicyAnnotationListener.class.getName()
+ ".EXTRA_POLICIES";
     
     private Bus bus;
@@ -437,6 +441,7 @@ public class PolicyAnnotationListener im
             
             return doc.getDocumentElement();
         } catch (XMLStreamException e) {
+            LOG.log(Level.WARNING, e.getMessage());
             return null;
         } finally {
             StaxUtils.close(reader);



Mime
View raw message