Author: sebb Date: Tue Feb 9 19:24:04 2010 New Revision: 908165 URL: http://svn.apache.org/viewvc?rev=908165&view=rev Log: Better ordering of elements
Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java?rev=908165&r1=908164&r2=908165&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java (original) +++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java Tue Feb 9 19:24:04 2010 @@ -39,10 +39,6 @@ private static final Logger log = LoggingManager.getLoggerForClass(); - private FileRowColContainer container; - - private int currentRow; - private static final int NO_LINE = -1; private static volatile String defaultFile = ""; // for omitted file names //$NON-NLS-1$ @@ -55,15 +51,6 @@ private static final Map<String, FileRowColContainer> fileContainers = new HashMap<String, FileRowColContainer>(); - /* - * Only needed locally - */ - private FileWrapper(FileRowColContainer fdc) { - super(); - container = fdc; - currentRow = -1; - } - /* The cache of file packs - used to improve thread access */ private static final ThreadLocal<Map<String, FileWrapper>> filePacks = new ThreadLocal<Map<String, FileWrapper>>() { @@ -73,6 +60,19 @@ } }; + private final FileRowColContainer container; + + private int currentRow; + + /* + * Only needed locally + */ + private FileWrapper(FileRowColContainer fdc) { + super(); + container = fdc; + currentRow = -1; + } + private static String checkDefault(String file) { if (file.length() == 0) { if (fileContainers.size() == 1 && defaultFile.length() > 0) { --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org