svn commit: r465334 - in /logging/log4cxx/trunk/src: charsetdecoder.cpp charsetencoder.cpp

[carnold]

Author: carnold
Date: Wed Oct 18 11:50:47 2006
New Revision: 465334

URL: http://svn.apache.org/viewvc?view=rev&rev=465334
Log:
LOGCXX-59: Improve exception when apr_xlate_open fails

Modified:
    logging/log4cxx/trunk/src/charsetdecoder.cpp
    logging/log4cxx/trunk/src/charsetencoder.cpp

Modified: logging/log4cxx/trunk/src/charsetdecoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetdecoder.cpp?view=diff&rev=465334&r1=465333&r2=465334
==============================================================================
--- logging/log4cxx/trunk/src/charsetdecoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetdecoder.cpp Wed Oct 18 11:50:47 2006
@@ -62,7 +62,13 @@
                     frompage,
                     pool);
                 if (stat != APR_SUCCESS) {
-                    throw IllegalArgumentException(topage);
+                     if (frompage == APR_DEFAULT_CHARSET) {
+                         throw IllegalArgumentException("APR_DEFAULT_CHARSET");
+                     if (frompage == APR_LOCALE_CHARSET) {
+                         throw IllegalArgumentException("APR_LOCALE_CHARSET");
+                     } else {
+                         throw IllegalArgumentException(frompage);
+                     }
                 }
               }
 

Modified: logging/log4cxx/trunk/src/charsetencoder.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/charsetencoder.cpp?view=diff&rev=465334&r1=465333&r2=465334
==============================================================================
--- logging/log4cxx/trunk/src/charsetencoder.cpp (original)
+++ logging/log4cxx/trunk/src/charsetencoder.cpp Wed Oct 18 11:50:47 2006
@@ -55,7 +55,13 @@
                      frompage,
                      pool);
                   if (stat != APR_SUCCESS) {
-                    throw IllegalArgumentException(topage);
+                     if (topage == APR_DEFAULT_CHARSET) {
+                         throw IllegalArgumentException("APR_DEFAULT_CHARSET");
+                     else if (topage == APR_LOCALE_CHARSET) {
+                         throw IllegalArgumentException("APR_LOCALE_CHARSET");
+                     } else {
+                         throw IllegalArgumentException(topage);
+                     }
                   }
               }