[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSExportImport.java, 1.1.1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22906

Modified Files:
	DSExportImport.java 
Log Message:
Bug(s) fixed: 178478
Bug Description: DSExportImport.java uses non-standard sun.io class
Reviewed by: Nathan, Noriko (Thanks!)
Fix Description: Use java.io.CharConversionException instead.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: DSExportImport.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSExportImport.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSExportImport.java	18 Jul 2005 00:55:39 -0000	1.1.1.1
+++ DSExportImport.java	9 Feb 2006 19:10:09 -0000	1.2
@@ -452,8 +452,9 @@
 					}
 				}
 				/* Create error message */
-				String msg;				
-				if (e instanceof sun.io.MalformedInputException) {
+				String msg;
+                /* see if there was an invalid char in the input e.g. a non-utf8 8 bit char */
+				if (e instanceof java.io.CharConversionException) {
 					String[] args = {String.valueOf(_numEntry), 
 									 e.toString()};					
 					msg = DSUtil._resource.getString("import", "malformedinputerror-label", args);