From c9c0a4f4fbd390fe967971788004c280812411ec Mon Sep 17 00:00:00 2001 From: "changhyun1.lee" Date: Mon, 26 Nov 2012 22:31:44 +0900 Subject: [PATCH] [Title] Fixed encoding NPE probelm of Template [Desc.] [Issue] Change-Id: I049a8ded0104a7649acd47a1abcf1ba5d6726e66 --- .../verrari/engine/jsoup/JsoupTemplateEngine.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/jsoup/JsoupTemplateEngine.java b/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/jsoup/JsoupTemplateEngine.java index 81c33a0..12c280f 100755 --- a/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/jsoup/JsoupTemplateEngine.java +++ b/org.tizen.common.verrari/src/org/tizen/common/verrari/engine/jsoup/JsoupTemplateEngine.java @@ -55,7 +55,8 @@ extends AbstractTemplateEngine * dummy base uri for HTML dom */ protected static final String BASE_URI = "http://www.tizen.org/sdk/ide/verrari"; - + public static String DEFAULT_ENCODING = "UTF-8"; + /* (non-Javadoc) * @see org.tizen.common.verrari.ITemplateEngine#getEngineVersion() */ @@ -87,9 +88,13 @@ extends AbstractTemplateEngine { logger.error( "Template is null for {}", templateKey ); } - final Document doc = - Jsoup.parse( template.open(), template.getEncoding(), BASE_URI ); - + + String encoding = template.getEncoding(); + if (encoding == null) { + encoding = DEFAULT_ENCODING; + } + final Document doc = Jsoup.parse( template.open(), encoding, BASE_URI ); + for ( String key : modelProvider.keys() ) { Elements elements = doc.select( key ); if (!elements.isEmpty()) { @@ -108,10 +113,9 @@ extends AbstractTemplateEngine } } } - - output.write( doc.html().getBytes( template.getEncoding() ) ); - output.flush(); + output.write( doc.html().getBytes(encoding) ); + output.flush(); } } \ No newline at end of file -- 2.7.4