Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
f145d16e
Commit
f145d16e
authored
4 years ago
by
juanf
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-9409 : Updating Jython to get JDK11 working
parent
942760b8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java
+6
-0
6 additions, 0 deletions
...openbis/dss/generic/shared/utils/Jython27ClassLoader.java
with
6 additions
and
0 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java
+
6
−
0
View file @
f145d16e
...
...
@@ -28,10 +28,13 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.Map
;
import
ch.systemsx.cisd.common.logging.LogCategory
;
import
ch.systemsx.cisd.common.logging.LogFactory
;
import
org.apache.commons.io.IOUtils
;
import
ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel
;
import
ch.systemsx.cisd.common.exceptions.EnvironmentFailureException
;
import
org.apache.log4j.Logger
;
/**
* Special class loader for classes based on jython 2.7. The jython JAR file has to be provided in the
...
...
@@ -49,6 +52,7 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
*/
public
class
Jython27ClassLoader
extends
ClassLoader
{
private
static
final
Logger
machineLog
=
LogFactory
.
getLogger
(
LogCategory
.
MACHINE
,
Jython27ClassLoader
.
class
);
private
static
final
List
<
String
>
EXCLUDED_PACKAGES_STARTS
=
Arrays
.
asList
(
"java"
,
"jdk."
,
"sun."
,
"com.sun."
);
private
final
URLClassLoader
jythonJarClassLoader
;
private
final
Map
<
String
,
Class
<?>>
cachedClasses
=
new
HashMap
<>();
...
...
@@ -75,6 +79,7 @@ public class Jython27ClassLoader extends ClassLoader
@Override
protected
Class
<?>
loadClass
(
String
name
,
boolean
resolve
)
throws
ClassNotFoundException
{
machineLog
.
info
(
"loadClass - name: "
+
name
+
" resolve: "
+
resolve
);
Class
<?>
clazz
=
cachedClasses
.
get
(
name
);
if
(
clazz
==
null
)
{
...
...
@@ -168,6 +173,7 @@ public class Jython27ClassLoader extends ClassLoader
private
Class
<?>
tryLoadClass
(
ClassLoader
classLoader
,
String
name
)
{
machineLog
.
info
(
"loadClass - classLoader: "
+
classLoader
+
" name: "
+
name
);
synchronized
(
getClassLoadingLock
(
name
))
{
InputStream
stream
=
classLoader
.
getResourceAsStream
(
name
.
replace
(
'.'
,
'/'
)
+
".class"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment