blob: e5cd38bd8a14546a6658ee041e2beaf29fd9895b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2010-04-27 15:58:44.000000000 +0200
+++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/boot/ModuleInitializeException.java 2011-06-13 01:28:14.000000000 +0200
@@ -48,7 +48,7 @@
*/
public ModuleInitializeException(final String s, final Exception e)
{
- super(s, e);
+ super(s, (Throwable) e);
}
/**
--- misc/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2010-04-27 15:58:46.000000000 +0200
+++ misc/build/libbase-1.1.6/source/org/pentaho/reporting/libraries/base/util/ClassQueryTool.java 2014-07-22 17:53:13.000000000 +0200
@@ -173,7 +173,7 @@
final File file = directoryOrJar.getAbsoluteFile();
if (file.isDirectory() && file.exists() && file.canRead())
{
- allURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
directoryURLs.add(file);
continue;
}
@@ -186,8 +186,8 @@
final String fileName = file.getName();
if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
{
- allURLs.add(file.toURL());
- jarURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
+ jarURLs.add(file.toURI().toURL());
}
}
@@ -199,7 +199,7 @@
final File file = driverFiles[i];
if (file.isDirectory() && file.exists() && file.canRead())
{
- allURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
directoryURLs.add(file);
continue;
}
@@ -212,8 +212,8 @@
final String fileName = file.getName();
if (fileName.endsWith(".jar") || fileName.endsWith(".zip"))
{
- allURLs.add(file.toURL());
- jarURLs.add(file.toURL());
+ allURLs.add(file.toURI().toURL());
+ jarURLs.add(file.toURI().toURL());
}
}
}
|
