Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Issue 'NoSuchFieldError: TRACE' from log4j #40

Merged
merged 3 commits into from
Nov 5, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected Map<KeepAliveKey, List<HttpClient>> initialValue() {
* @return An object in the cache, or null if there is none.
*/
@Override
public Object get(URL url, Object obj) {
public HttpClient get(URL url, Object obj) {
Map<KeepAliveKey, List<HttpClient>> map = localHash.get();
KeepAliveKey dkak = new KeepAliveKey(url);
List<HttpClient> clientVector = map.get(dkak);
Expand Down
Binary file added harness/lib/log4j-1.2.17.jar
Binary file not shown.
Binary file removed harness/lib/log4j-1.2.8.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion harness/src/com/sun/faban/harness/agent/CmdAgentImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public void updatePaths(List<String> pathList) {
}

ArrayList<String> libList = new ArrayList<String>();
getClassPath(Config.SERVICE_DIR + path, libList);
getClassPath(Config.SERVICE_DIR + path + "/lib/", libList);
if (libList.size() > 0) {
if (servicesClassPath.get(path) == null) {
servicesClassPath.put(path, libList);
Expand Down