Author: gadams
Date: Thu Oct 9 04:48:19 2014
New Revision: 1630279
URL: http://svn.apache.org/r1630279
Log:
FOP-2415: prevent NPE when Indic script syllabizer is not available
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java?rev=1630279&r1=1630278&r2=1630279&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
Thu Oct 9 04:48:19 2014
@@ -216,7 +216,7 @@ public class IndicScriptProcessor extend
}
private GlyphSequence[] syllabize(GlyphSequence gs, String script, String
language) {
- return Syllabizer.getSyllabizer(script, language,
getSyllabizerClass()) .syllabize(gs);
+ return Syllabizer.getSyllabizer(script, language,
getSyllabizerClass()).syllabize(gs);
}
private GlyphSequence unsyllabize(GlyphSequence gs, GlyphSequence[] sa) {
@@ -405,7 +405,8 @@ public class IndicScriptProcessor extend
String sid = makeSyllabizerId(script, language);
Syllabizer s = syllabizers.get(sid);
if (s == null) {
- if ((s = makeSyllabizer(script, language, syllabizerClass)) ==
null) {
+ if ((syllabizerClass == null) || ((s = makeSyllabizer(script,
language, syllabizerClass)) == null)) {
+ log.warn("No syllabizer available for script '" + script +
"', language '" + language + "', using default Indic syllabizer.");
s = new DefaultSyllabizer(script, language);
}
syllabizers.put(sid, s);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
