sebb 2005/07/08 17:17:26 Modified: src/core/org/apache/jmeter/save/converters TestResultWrapperConverter.java src/core/org/apache/jmeter/save SaveService.java Log: Fix version checks Revision Changes Path 1.4 +3 -0 jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java Index: TestResultWrapperConverter.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- TestResultWrapperConverter.java 9 Jul 2005 00:10:37 -0000 1.3 +++ TestResultWrapperConverter.java 9 Jul 2005 00:17:26 -0000 1.4 @@ -42,6 +42,9 @@ public class TestResultWrapperConverter extends AbstractCollectionConverter { + /** Returns the converter version; used to check for possible incompatibilities */ + public static String getVersion(){ return "$Revision$";} + /** * @param arg0 * @param arg1 1.66 +2 -2 jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java Index: SaveService.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- SaveService.java 9 Jul 2005 00:10:38 -0000 1.65 +++ SaveService.java 9 Jul 2005 00:17:26 -0000 1.66 @@ -257,7 +257,7 @@ null); actual = extractVersion(actual); } - catch (Exception e) + catch (Exception ignored) { //Not needed } @@ -288,7 +288,7 @@ checkVersion(TestElementConverter.class, "1.3"); checkVersion(TestElementPropertyConverter.class, "1.6"); checkVersion(ScriptWrapperConverter.class, "1.5"); - checkVersion(TestResultWrapperConverter.class, "1.3"); + checkVersion(TestResultWrapperConverter.class, "1.4"); if (!PROPVERSION.equalsIgnoreCase(propertiesVersion)) { log.warn("Property file - expected " + PROPVERSION + ", found "
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]