You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/08/28 10:36:38 UTC
svn commit: r1518103 - in /jmeter/trunk: build.xml
src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Author: sebb
Date: Wed Aug 28 08:36:37 2013
New Revision: 1518103
URL: http://svn.apache.org/r1518103
Log:
Drop temporary cast.
Add build debug to trace issue with buildbot build
Modified:
jmeter/trunk/build.xml
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1518103&r1=1518102&r2=1518103&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Wed Aug 28 08:36:37 2013
@@ -570,6 +570,14 @@
<target name="compile-components" depends="compile-jorphan,compile-core" description="Compile generic (protocol-independent) components.">
<mkdir dir="${build.components}"/>
+ <!-- get the source compile classpath in a printable form -->
+ <pathconvert pathsep="${line.separator}| |-- "
+ property="echo.path.compile"
+ refid="classpath">
+ </pathconvert>
+ <echo message="|-- compile classpath"/>
+ <echo message="| |"/>
+ <echo message="| |-- ${echo.path.compile}"/>
<javac srcdir="${src.components}" destdir="${build.components}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=1518103&r1=1518102&r2=1518103&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java Wed Aug 28 08:36:37 2013
@@ -95,12 +95,10 @@ class SMIMEAssertion {
}
if (msg.isMimeType("multipart/signed")) { // $NON-NLS-1$
MimeMultipart multipart = (MimeMultipart) msg.getContent();
- // temporary cast to try and trace issue with buildbot trunk build
- s = new SMIMESignedParser((org.bouncycastle.operator.DigestCalculatorProvider) new BcDigestCalculatorProvider(), multipart);
+ s = new SMIMESignedParser(new BcDigestCalculatorProvider(), multipart);
} else if (msg.isMimeType("application/pkcs7-mime") // $NON-NLS-1$
|| msg.isMimeType("application/x-pkcs7-mime")) { // $NON-NLS-1$
- // temporary cast to try and trace issue with buildbot trunk build
- s = new SMIMESignedParser((org.bouncycastle.operator.DigestCalculatorProvider) new BcDigestCalculatorProvider(), msg);
+ s = new SMIMESignedParser(new BcDigestCalculatorProvider(), msg);
}
if (null != s) {