From 66669861b0b95f9846057fde44e9b3dacc5ff8f3 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 24 Jan 2017 08:08:53 +0000
Subject: [PATCH] SSDM-4473: Use always Jython 2.5

SVN: 37615
---
 openbis/dist/server/register-master-data.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openbis/dist/server/register-master-data.sh b/openbis/dist/server/register-master-data.sh
index 0ed3ec8c9ba..ab4b3f61541 100755
--- a/openbis/dist/server/register-master-data.sh
+++ b/openbis/dist/server/register-master-data.sh
@@ -18,11 +18,10 @@ if [ ! -x "$JVM" ]; then
   exit 1
 fi
 
-disableJythonByProperty
-
 LIB=$BASE/../webapps/$APPLICATION_NAME/WEB-INF/lib
 
+# always Jython 2.5 is used independent which one is enabled. Fixing bug SSDM-4473
 $JVM \
  -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StrErrLog \
- -cp $LIB/\* \
+ -cp $LIB/jython-2.5.2.jar_disabled:$LIB/\* \
  ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl.MasterDataRegistrationScriptRunnerStandalone "$@"
-- 
GitLab