cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r941163 - in /cxf/branches/2.2.x-fixes: ./ common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
Date Wed, 05 May 2010 06:32:56 GMT
Author: dkulp
Date: Wed May  5 06:32:56 2010
New Revision: 941163

URL: http://svn.apache.org/viewvc?rev=941163&view=rev
Log:
Merged revisions 941158 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r941158 | dkulp | 2010-05-05 02:27:25 -0400 (Wed, 05 May 2010) | 1 line
  
  Fix some eclipse warnings
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
    cxf/branches/2.2.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java

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

Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java?rev=941163&r1=941162&r2=941163&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
(original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/util/Base64Utility.java
Wed May  5 06:32:56 2010
@@ -194,7 +194,7 @@ public final class Base64Utility {
         try {
             ostream.write(decodeChunk(id, o, l));
         } catch (Exception e) {
-            LOG.warning("Invalid base64 encoded string : " + id);
+            LOG.warning("Invalid base64 encoded string : " + new String(id));
             throw new Base64Exception(new Message("BASE64_RUNTIME_EXCEPTION", LOG), e);
         }
     }

Modified: cxf/branches/2.2.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java?rev=941163&r1=941162&r2=941163&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
(original)
+++ cxf/branches/2.2.x-fixes/common/common/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
Wed May  5 06:32:56 2010
@@ -101,7 +101,7 @@ public class Base64UtilityTest extends A
     public void testDecodeInvalidString() throws Exception {
         try {
             String in = "QWxhZGRpbjpcGVuIHNlc2FtZQ==";
-            byte bytes[] = Base64Utility.decode(in);
+            Base64Utility.decode(in);
             fail("This test should be fail");
         } catch (Base64Exception e) {
             //nothing to do



Mime
View raw message