cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r890617 - in /cxf/branches/2.1.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/ tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/
Date Tue, 15 Dec 2009 03:07:28 GMT
Author: dkulp
Date: Tue Dec 15 03:07:26 2009
New Revision: 890617

URL: http://svn.apache.org/viewvc?rev=890617&view=rev
Log:
Merged revisions 890607 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r890607 | dkulp | 2009-12-14 21:45:12 -0500 (Mon, 14 Dec 2009) | 11 lines
  
  Merged revisions 890056 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r890056 | bharath | 2009-12-13 07:16:17 -0500 (Sun, 13 Dec 2009) | 3 lines
    
    @Bug: CXF-2581
    @Desc During logging, we invoke toString on an array, which will generate junk result.
Fixed this by invoking Arrays.toString to convert the array into a readable String that gives
the contents of the array.
    @Test Units Tests
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefaultIncludeResolver.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=890617&r1=890616&r2=890617&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Tue Dec 15 03:07:26 2009
@@ -22,6 +22,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -438,7 +439,7 @@
             Map<String, Object> reqContext = null;
             Map<String, Object> resContext = null;
             if (LOG.isLoggable(Level.FINE)) {
-                LOG.fine("Invoke, operation info: " + oi + ", params: " + params);
+                LOG.fine("Invoke, operation info: " + oi + ", params: " + Arrays.toString(params));
             }
             Message message = endpoint.getBinding().createMessage();
             if (null != context) {

Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=890617&r1=890616&r2=890617&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Dec 15 03:07:26 2009
@@ -400,8 +400,8 @@
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.log(Level.FINE, "Conduit '" + getConduitName()
                     + "' has been configured for TLS "
-                    + "keyManagers " + tlsClientParameters.getKeyManagers()
-                    + "trustManagers " + tlsClientParameters.getTrustManagers()
+                    + "keyManagers " + Arrays.toString(tlsClientParameters.getKeyManagers())
+                    + "trustManagers " + Arrays.toString(tlsClientParameters.getTrustManagers())
                     + "secureRandom " + tlsClientParameters.getSecureRandom()
                     + "Disable Common Name (CN) Check: " + tlsClientParameters.isDisableCNCheck());
             }
@@ -1345,8 +1345,8 @@
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.log(Level.FINE, "Conduit '" + getConduitName()
                     + "' has been (re) configured for TLS "
-                    + "keyManagers " + tlsClientParameters.getKeyManagers()
-                    + "trustManagers " + tlsClientParameters.getTrustManagers()
+                    + "keyManagers " + Arrays.toString(tlsClientParameters.getKeyManagers())
+                    + "trustManagers " + Arrays.toString(tlsClientParameters.getTrustManagers())
                     + "secureRandom " + tlsClientParameters.getSecureRandom());
             }
         } else {

Modified: cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefaultIncludeResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefaultIncludeResolver.java?rev=890617&r1=890616&r2=890617&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefaultIncludeResolver.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefaultIncludeResolver.java
Tue Dec 15 03:07:26 2009
@@ -23,6 +23,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.util.Arrays;
 
 /**
  * @author lk
@@ -64,7 +65,8 @@
                 return url;
             } catch (MalformedURLException e) {
                 final PreprocessingException preprocessingException = new PreprocessingException(
-                        "Unable to resolve user include '" + spec + "' in '" + userIdlDirs
+ "'", null, 0);
+                    "Unable to resolve user include '" + spec + "' in '"
+                        + Arrays.toString(userIdlDirs) + "'", null, 0);
                 preprocessingException.initCause(e);
                 throw preprocessingException;
             }



Mime
View raw message