Projects >> ngrinder >>7169d963f5421ce711116e314413edfb0eb93c9c

Chunk
Conflicting content 
		if (StringUtils.isEmpty(scriptPath)) {
			return JSONUtil.toJson(fileStringList);
		}
<<<<<<< HEAD
		List fileList = fileEntiryService.getLibAndResourceEntries(user, scriptPath);
		for (FileEntry each : fileList) {
			fileStringList.add(each.getPath());
=======
		List fileEntries = fileEntryService
						.getFileEntries(user, FilenameUtils.getPath(scriptPath));
		List fileList = new ArrayList();

		for (FileEntry eachFileEntry : fileEntries) {
			FileType fileType = eachFileEntry.getFileType();
			if (fileType != FileType.DIR && fileType != FileType.PYTHON_SCRIPT) {
				fileList.add(eachFileEntry.getPath());
			}
>>>>>>> 61cc4414b99e3d02a1d7476cf22e5d621b337b26
		}
		return JSONUtil.toJson(fileStringList);
	}
Solution content 
		if (StringUtils.isEmpty(scriptPath)) {
			return JSONUtil.toJson(fileStringList);
		}
		List fileList = fileEntryService.getLibAndResourceEntries(user, scriptPath);
		for (FileEntry each : fileList) {
			fileStringList.add(each.getPath());
		}
		return JSONUtil.toJson(fileStringList);
	}
File
PerfTestController.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
		if (user.getRole().equals(Role.ADMIN) || user.getRole().equals(Role.SUPER_USER)) {
			return test;
		}
<<<<<<< HEAD
		if (test != null && !test.getLastModifiedUser().equals(user)) {
			throw new NGrinderRuntimeException("User " + getCurrentUser().getUserId() + " has no right on PerfTest ");
=======
		if (test != null && !test.getCreatedUser().equals(user)) {
			throw new NGrinderRuntimeException("User " + getCurrentUser().getUserId()
							+ " has no right on  PerfTest ");
>>>>>>> 61cc4414b99e3d02a1d7476cf22e5d621b337b26
		}
		return test;
	}
Solution content 
		if (user.getRole().equals(Role.ADMIN) || user.getRole().equals(Role.SUPER_USER)) {
			return test;
		}
		if (test != null && !test.getLastModifiedUser().equals(user)) {
			throw new NGrinderRuntimeException("User " + getCurrentUser().getUserId() + " has no right on PerfTest ");
		}
		return test;
	}
File
PerfTestController.java
Developer's decision
Version 1
Kind of conflict
If statement
Throw statement