cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r707174 - in /cxf/branches/2.0.x-fixes/rt: core/src/main/java/org/apache/cxf/endpoint/ databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/ databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/ databinding/jaxb/src/mai...
Date Wed, 22 Oct 2008 19:38:58 GMT
Author: dkulp
Date: Wed Oct 22 12:38:58 2008
New Revision: 707174

URL: http://svn.apache.org/viewvc?rev=707174&view=rev
Log:
Fix eclipse warnings, get tests up to systest working

Modified:
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
    cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
    cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
    cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Wed Oct 22 12:38:58 2008
@@ -545,6 +545,9 @@
     }
 
     private void setParameters(Object[] params, Message message) {
+        if (params == null) {
+            params = new Object[0];
+        }
         MessageContentsList contents = new MessageContentsList(params);
         message.setContent(List.class, contents);
     }

Modified: cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
Wed Oct 22 12:38:58 2008
@@ -212,6 +212,7 @@
         return paramClass;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public Type createDefaultType(TypeClassInfo info) {
         QName typeName = info.getTypeName();
@@ -251,6 +252,7 @@
         return type;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public QName createQName(Class typeClass) {
         String name = null;

Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Wed Oct 22 12:38:58 2008
@@ -290,7 +290,6 @@
         return client;
     }
 
-    @SuppressWarnings("deprecation")
     private void addBindingFiles(List<String> bindingFiles, SchemaCompiler compiler)
{
         if (bindingFiles != null) {
             for (String s : bindingFiles) {

Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Wed Oct 22 12:38:58 2008
@@ -307,7 +307,6 @@
             throw new Fault(new Message("MARSHAL_ERROR", BUNDLE, e.getMessage()), e);
         }
     }
-    @SuppressWarnings("unchecked")
     public static Exception unmarshallException(JAXBContext context, 
                                     Schema schema, 
                                     Object source,

Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java
Wed Oct 22 12:38:58 2008
@@ -302,7 +302,8 @@
         }
         
         if (compatible) {
-            compatible &= p1.getContentType().equals(p2.getContentType());
+            compatible &= !p1.isSetContentType() || !p2.isSetContentType()
+                || p1.getContentType().equals(p2.getContentType());
         }
         
         if (compatible) {
@@ -495,7 +496,7 @@
         }
         
         if (compatible) {
-            compatible &= p1.getContentType().equals(p2.getContentType());
+            compatible &= compatible(p1.getContentType(), p2.getContentType());
         }
         
         if (compatible) {

Modified: cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?rev=707174&r1=707173&r2=707174&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Wed Oct 22 12:38:58 2008
@@ -238,15 +238,15 @@
             
         }
         Collection<AssertionInfo> ais = aim.get(MetadataConstants.USING_ADDRESSING_2004_QNAME);
-        if (null != ais || ais.size() > 0) {
+        if (null != ais && ais.size() > 0) {
             return true;
         }
         ais = aim.get(MetadataConstants.USING_ADDRESSING_2005_QNAME);
-        if (null != ais || ais.size() > 0) {
+        if (null != ais && ais.size() > 0) {
             return true;
         }
         ais = aim.get(MetadataConstants.USING_ADDRESSING_2006_QNAME);
-        if (null != ais || ais.size() > 0) {
+        if (null != ais && ais.size() > 0) {
             return true;
         } 
         return false;



Mime
View raw message