azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert changes done in attenpt to fix the build as now indications it helped

Browse Source
This commit is contained in:
Alex Tkachman
2012-08-02 07:44:48 +03:00
parent 380d7add9f
commit 45a08ff9ae
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+7 -2
View File
@@ -28,7 +28,6 @@ import jet.modules.Module;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.analyzer.AnalyzeExhaust; import org.jetbrains.jet.analyzer.AnalyzeExhaust;
import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
import org.jetbrains.jet.cli.common.CompilerPlugin; import org.jetbrains.jet.cli.common.CompilerPlugin;
import org.jetbrains.jet.cli.common.CompilerPluginContext; import org.jetbrains.jet.cli.common.CompilerPluginContext;
import org.jetbrains.jet.cli.common.messages.*; import org.jetbrains.jet.cli.common.messages.*;
@@ -407,7 +406,13 @@ public class KotlinToJVMBytecodeCompiler {
if(loader instanceof URLClassLoader) { if(loader instanceof URLClassLoader) {
for (URL url : ((URLClassLoader) loader).getURLs()) { for (URL url : ((URLClassLoader) loader).getURLs()) {
String urlFile = url.getPath(); String urlFile;
try {
urlFile = url.toURI().getPath();
}
catch (URISyntaxException e) {
throw ExceptionUtils.rethrow(e);
}
File file = new File(urlFile); File file = new File(urlFile);
if(file.exists() && (file.isDirectory() || file.getName().endsWith(".jar"))) { if(file.exists() && (file.isDirectory() || file.getName().endsWith(".jar"))) {
files.add(file); files.add(file);