View | Details | Raw Unified | Return to bug 40100
Collapse All | Expand All

(-)D:/Development/Eclipse/Workspace/jmeter/src/core/org/apache/jmeter/services/FileServer.java (-3 / +8 lines)
Lines 112-118 Link Here
112
		}
112
		}
113
	}
113
	}
114
114
115
   /**
115
	/**
116
	 * Get the next line of the named file, recycle by default.
116
	 * Get the next line of the named file, recycle by default.
117
	 *
117
	 *
118
     * @param filename
118
     * @param filename
Lines 126-132 Link Here
126
   /**
126
   /**
127
	 * Get the next line of the named file.
127
	 * Get the next line of the named file.
128
	 * 
128
	 * 
129
     * @param filename
129
	 * @param filename
130
     * @param recycle - should file be restarted at EOF?
130
     * @param recycle - should file be restarted at EOF?
131
	 * @return String containing the next line in the file (null if EOF reached and not recycle)
131
	 * @return String containing the next line in the file (null if EOF reached and not recycle)
132
	 * @throws IOException
132
	 * @throws IOException
Lines 191-197 Link Here
191
    private void closeFile(String name, FileEntry fileEntry) throws IOException {
191
    private void closeFile(String name, FileEntry fileEntry) throws IOException {
192
        if (fileEntry != null && fileEntry.inputOutputObject != null) {
192
        if (fileEntry != null && fileEntry.inputOutputObject != null) {
193
            log.info("Close: "+name);
193
            log.info("Close: "+name);
194
			((Reader) fileEntry.inputOutputObject).close();
194
            if (fileEntry.inputOutputObject instanceof Reader)
195
                ((Reader) fileEntry.inputOutputObject).close();
196
            else if (fileEntry.inputOutputObject instanceof Writer)
197
                ((Writer) fileEntry.inputOutputObject).close();
198
            else 
199
                log.error("Unknow inputOutputObject type : " + fileEntry.inputOutputObject.getClass());
195
			fileEntry.inputOutputObject = null;
200
			fileEntry.inputOutputObject = null;
196
		}
201
		}
197
    }
202
    }

Return to bug 40100