Author: sebb Date: Wed Aug 5 13:25:21 2009 New Revision: 801224 URL: http://svn.apache.org/viewvc?rev=801224&view=rev Log: Flag potential charset problems
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java Wed Aug 5 13:25:21 2009 @@ -61,7 +61,7 @@ result.setFailure(false); // the result data - String resultData = new String(getResultBody(responseData)); + String resultData = new String(getResultBody(responseData)); // TODO - charset? SAXBuilder builder = (SAXBuilder) myBuilder.get(); Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java Wed Aug 5 13:25:21 2009 @@ -73,7 +73,7 @@ if (data.length == 0) { return result.setResultForNull(); } - String resultData = new String(getResultBody(data)); + String resultData = new String(getResultBody(data)); // TODO - charset? String xsdFileName = getXsdFileName(); if (log.isDebugEnabled()) { Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java Wed Aug 5 13:25:21 2009 @@ -384,7 +384,7 @@ for (int i = 0; i < numColumns; i++) { Object o = rs.getObject(i + 1); if (o instanceof byte[]) { - o = new String((byte[]) o); + o = new String((byte[]) o); // TODO - charset? } data.addColumnValue(dbCols[i], o); } Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java Wed Aug 5 13:25:21 2009 @@ -77,7 +77,7 @@ return; } initRegex(getArgumentName()); - String text = new String(responseText.getResponseData()); + String text = new String(responseText.getResponseData()); // TODO - charset? Perl5Matcher matcher = JMeterUtils.getMatcher(); String value = ""; if (isPathExtension() && isPathExtensionNoEquals() && isPathExtensionNoQuestionmark()) { Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java Wed Aug 5 13:25:21 2009 @@ -74,7 +74,7 @@ Parser htmlParser = null; try { - String contents = new String(html); + String contents = new String(html); // TODO - charset? htmlParser = new Parser(); htmlParser.setInputHTML(contents); } catch (Exception e) { Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java Wed Aug 5 13:25:21 2009 @@ -145,7 +145,7 @@ // TODO: find a way to avoid the cost of creating a String here -- // probably a new PatternMatcherInput working on a byte[] would do // better. - input.setInput(new String(html)); + input.setInput(new String(html)); // TODO - charset? Pattern pattern=JMeterUtils.getPatternCache().getPattern( REGEXP, Perl5Compiler.CASE_INSENSITIVE_MASK Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java?rev=801224&r1=801223&r2=801224&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java Wed Aug 5 13:25:21 2009 @@ -110,7 +110,7 @@ byte[] header = file.getHeader().getBytes(); // TODO what encoding should be used here? out.write(header); // Retrieve the formatted data using the same encoding used to create it - postedBody.append(new String(header)); + postedBody.append(new String(header)); // TODO - charset? // Write the actual file content writeFileToStream(file.getPath(), out); // We just add placeholder text for file content --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org