Revision: 6245
http://sourceforge.net/p/jump-pilot/code/6245
Author: michaudm
Date: 2020-04-12 14:53:52 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
Now tolerate an empty cpg file along with shapefile
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2020-04-12 14:35:08 UTC (rev 6244)
+++ core/trunk/ChangeLog 2020-04-12 14:53:52 UTC (rev 6245)
@@ -4,6 +4,9 @@
# 3. be concise but convey the change in a way that ordinary users understand
#<-------------------------------- 80 chars
---------------------------------->#
+2020-04-12 mmichaud <m.michael.mich...@orange.fr>
+ * Now tolerate an empty cpg file along with shapefile
+
* release 1.15
*****************************************************************
2020-02-12 Nicolas Ribot
Modified: core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
2020-04-12 14:35:08 UTC (rev 6244)
+++ core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
2020-04-12 14:53:52 UTC (rev 6245)
@@ -317,14 +317,16 @@
try (BufferedReader cpgCharsetReader =
new BufferedReader(new
InputStreamReader(cpgCharsetInputStream))) {
String cpgCharset = cpgCharsetReader.readLine();
- cpgCharset = esri_cp_2_java(cpgCharset);
try {
+ cpgCharset = esri_cp_2_java(cpgCharset);
if (Charset.isSupported(cpgCharset)) {
charsetName = cpgCharset;
}
- } catch (IllegalCharsetNameException ice) {
- Logger.info("Could not interpret charset name " +
cpgCharset + " : revert to default " + charsetName);
}
+ // Emit NPE if the file is empty
+ catch (IllegalCharsetNameException|NullPointerException
ice) {
+ Logger.warn("Could not interpret charset name " +
cpgCharset + " : revert to default " + charsetName);
+ }
}
}
}
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
