dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing inconsistent merge issues implementing nbaars fixes

Browse Source
This commit is contained in:
Doug Morato 2015-09-18 12:40:05 -04:00
parent c427db4f56
commit 6147aebf61
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
View File

@ -17,8 +17,6 @@ import java.util.zip.ZipFile;
/**
* Extract the jar file and place them in the system temp directory in the folder webgoat and collect the files
* and classes.
*
* @version $Id: $Id
*/
public class PluginExtractor {
@ -36,10 +34,6 @@ public class PluginExtractor {
boolean processed = processClassFile(zipEntry);
if (!processed) {
* @param target a {@link java.nio.file.Path} object.
*/
public void extract(final Path target) {
try (FileSystem zip = createZipFileSystem()) {
processed = processPropertyFile(zipFile, zipEntry, targetDirectory);
}
if (!processed) {
@ -94,20 +88,10 @@ public class PluginExtractor {
return targetFile;
}
/**
* <p>Getter for the field <code>classes</code>.</p>
*
* @return a {@link java.util.List} object.
*/
public List<String> getClasses() {
return this.classes;
}
/**
* <p>Getter for the field <code>files</code>.</p>
*
* @return a {@link java.util.List} object.
*/
public List<Path> getFiles() {
return this.files;
}

5
webgoat-container/src/main/java/org/owasp/webgoat/util/LabelProvider.java
View File

@ -92,11 +92,6 @@ public class LabelProvider {
return Thread.currentThread().getContextClassLoader();
}
});
/**
* <p>refresh.</p>
*/
public static void refresh() {
pluginLabels.clearCache();
}