src/java/m/rusle2/V3_0.java
| @@ -175,13 +175,18 @@ |
| createInputFile(r2script, getParamMap()); |
| } |
| |
| + // protect the DLL? |
| + private static final Object romeLock = new Object(); |
| + |
| |
| @Override |
| protected void doProcess() throws Exception { |
| try { |
| - Executable python = resources().getExe(V3_0.PYTHON); |
| - LOG.log(Level.INFO, "EXECUTING PYROME FROM doProcess()..."); |
| - int result = r2run.executePyrome(new File(workspace().getDir(), R2_TMP_FILENAME + R2_TMP_FILEEXT), python); |
| + synchronized (romeLock) { |
| + Executable python = resources().getExe(V3_0.PYTHON); |
| + LOG.log(Level.INFO, "EXECUTING PYROME FROM doProcess()..."); |
| + int result = r2run.executePyrome(new File(workspace().getDir(), R2_TMP_FILENAME + R2_TMP_FILEEXT), python); |
| + } |
| } catch (Exception e) { |
| LOG.log(Level.SEVERE, "ERROR EXECUTING PYTHON-RUSLE2", e); |
| throw e; |
web/WEB-INF/csip-defaults.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-r2.version": "$version: 2.11.8.12 default 82 994360fe4d17 2021-05-10 lyaege, built at 2022-01-05 17:58 by od$", |
| + "csip-r2.version": "$version: 2.11.8.14 default 84 ff24976ba817 2022-01-27 casesp, built at 2022-02-03 17:08 by od$", |
| "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_temp;user=lmod-rw;password=?", |
| "sdmONLINE":"true", |
| "csip.session.ttl": "PT1M", |